UI changes

UI changes

3 files changed, 19 insertions, 18 deletions

diff --git a/data/wichtig.dat b/data/wichtig.dat
index 870ff71..588d973 100644
--- a/data/wichtig.dat
+++ b/data/wichtig.dat
@@ -2383,8 +2383,6 @@ Mlde,Mulde,,47.30059,10.18399,2101
 Mld1,Mulde 1,nach SW- in aufsteilende Mulde,47.28672,10.09384,1883
 MUELLNALM,Müllneralm,,47.65629,14.4985,969
 MULWAD,Mullwitzaderl,,47.09044,12.36753,3250
-MNCHHS,Münchner Haus,,47.42108,10.98527,2964
-MNCHNR,Münchner Haus,,47.42095,10.98444,2960
 MNCHWD,Münchser Wand,,49.67728,11.3765,600.2
 MUND,Mund,,46.31533,7.94171,1167
 MUNSTR,Münster,,46.48742,8.26435,1388
@@ -4029,7 +4027,7 @@ WINDHAGSEE,Windhagersee,,47.68578,14.25003,1042
 WINDLOCH,Windloch,Höhle,47.61675,14.15972,1961
 WINDSBORN,Windsborn Maar - Kratergipfel,höchster Punkt am Kraterrand des Windsborn Maars; Gipfelkreuz,50.08428,6.77546,503
 WNKLAL,Winkelalm,,47.61277,12.29584,1192
-WNBCHWK,Winnebacher Weißogel,,47.11052,11.06038,3182
+WNBCHWK,Winnebacher Weißkogel,,47.11052,11.06038,3182
 WGiGr,Wintergipfel/Grat,auch Wintergipfel,47.27665,10.10015,2083
 WINTERST,Winterstaude,,47.39944,9.98111,1877
 WHSSTM,Wirtshaus St. Martin,am Weg auf den Kramer (Grasberg-Route); schöne Aussicht,47.50276,11.07104,1052
diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index f4ad159..173f889 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -1,5 +1,5 @@
 // 
-// "$Id: GipfelWidget.cxx,v 1.7 2005/04/14 21:15:45 hofmann Exp $"
+// "$Id: GipfelWidget.cxx,v 1.8 2005/04/14 21:48:28 hofmann Exp $"
 //
 // PSEditWidget routines.
 //
@@ -83,7 +83,7 @@ GipfelWidget::draw() {
   fl_push_clip(x(), y(), w(), h());
   img->draw(x(),y(),w(),h(),0,0);
 
-  fl_font(FL_COURIER, 10);
+  fl_font(FL_HELVETICA, 8);
   m = pan->get_visible_mountains();
   while (m) {
     if (m == cur_mountain) {
diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 471bb3e..3305312 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -1,5 +1,5 @@
 // 
-// "$Id: gipfel.cxx,v 1.8 2005/04/14 21:15:45 hofmann Exp $"
+// "$Id: gipfel.cxx,v 1.9 2005/04/14 21:48:28 hofmann Exp $"
 //
 // flpsed program.
 //
@@ -148,7 +148,16 @@ int main(int argc, char** argv) {
   win = new Fl_Window(800,700);
   m = new Fl_Menu_Bar(0, 0, 800, 30);
   m->menu(menuitems);
-  Fl_Slider* s = new Fl_Slider(0, 30, 160, 15, "scale");
+  Fl_Slider* a = new Fl_Slider(50, 30, 750, 15, "angle");
+  a->type(1);
+  a->box(FL_THIN_DOWN_BOX);
+  a->labelsize(10);
+  a->step(0.00001);
+  a->bounds(-3.14, 3.14);
+  a->slider(FL_UP_BOX);
+  a->callback((Fl_Callback*)angle_cb);
+  a->align(FL_ALIGN_LEFT);
+  Fl_Slider* s = new Fl_Slider(100, 45, 160, 15, "scale");
   s->type(1);
   s->box(FL_THIN_DOWN_BOX);
   s->labelsize(10);
@@ -156,15 +165,8 @@ int main(int argc, char** argv) {
   s->bounds(0.0, 2000.0);
   s->slider(FL_UP_BOX);
   s->callback((Fl_Callback*)scale_cb);
-  Fl_Slider* a = new Fl_Slider(160, 30, 160, 15, "angle");
-  a->type(1);
-  a->box(FL_THIN_DOWN_BOX);
-  a->labelsize(10);
-  a->step(0.0001);
-  a->bounds(-3.14, 3.14);
-  a->slider(FL_UP_BOX);
-  a->callback((Fl_Callback*)angle_cb);
-  Fl_Slider* n = new Fl_Slider(320, 30, 160, 15, "nick");
+  s->align(FL_ALIGN_LEFT);
+  Fl_Slider* n = new Fl_Slider(360, 45, 160, 15, "nick");
   n->type(1);
   n->box(FL_THIN_DOWN_BOX);
   n->labelsize(10);
@@ -172,7 +174,8 @@ int main(int argc, char** argv) {
   n->bounds(-0.5, 0.5);
   n->slider(FL_UP_BOX);
   n->callback((Fl_Callback*)nick_cb);
-  Fl_Slider* r = new Fl_Slider(480, 30, 160, 15, "height-dist");
+  n->align(FL_ALIGN_LEFT);
+  Fl_Slider* r = new Fl_Slider(620, 45, 160, 15, "height-dist");
   r->type(1);
   r->box(FL_THIN_DOWN_BOX);
   r->labelsize(10);
@@ -180,7 +183,7 @@ int main(int argc, char** argv) {
   r->bounds(0.2, 0.02);
   r->slider(FL_UP_BOX);
   r->callback((Fl_Callback*)h_d_cb);
-
+  r->align(FL_ALIGN_LEFT);
 
   scroll = new Fl_Scroll(0, 60, win->w(), win->h()-60);