Removed the large panel option (P_large).

Nobody saw use for it...

4 files changed, 15 insertions, 43 deletions

diff --git a/src/menu.cc b/src/menu.cc
index 090e2b56..7eacbaa3 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -631,8 +631,7 @@ void a_Menu_tools_popup(BrowserWindow *bw, void *v_wid)
       {"Panel size", 0, Menu_nop_cb, (void*)"Submenu1", FL_SUBMENU,0,0,0,0},
          {"tiny",  0,Menu_panel_change_cb,(void*)0,FL_MENU_RADIO,0,0,0,0},
          {"small", 0,Menu_panel_change_cb,(void*)1,FL_MENU_RADIO,0,0,0,0},
-         {"medium",0,Menu_panel_change_cb,(void*)2,FL_MENU_RADIO,0,0,0,0},
-         {"large", 0,Menu_panel_change_cb,(void*)3,
+         {"medium",0,Menu_panel_change_cb,(void*)2,
            FL_MENU_RADIO|FL_MENU_DIVIDER,0,0,0,0},
          {"small icons", 0,Menu_panel_change_cb,(void*)10,
            FL_MENU_TOGGLE,0,0,0,0},
diff --git a/src/prefs.h b/src/prefs.h
index 19e3890a..e81bda18 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -24,7 +24,7 @@ extern "C" {
 #define PREFS_GEOMETRY_DEFAULT_YPOS  -9999
 
 /* Panel sizes */
-enum { P_tiny = 0, P_small, P_medium, P_large };
+enum { P_tiny = 0, P_small, P_medium };
 
 enum {PREFS_FILTER_ALLOW_ALL,
       PREFS_FILTER_SAME_DOMAIN};
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index bf973225..3f8e4a97 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -176,8 +176,6 @@ int PrefsParser::parseOption(char *name, char *value)
          prefs.panel_size = P_tiny;
       else if (!dStrcasecmp(value, "small"))
          prefs.panel_size = P_small;
-      else if (!dStrcasecmp(value, "large"))
-         prefs.panel_size = P_large;
       else /* default to "medium" */
          prefs.panel_size = P_medium;
       break;
diff --git a/src/ui.cc b/src/ui.cc
index 434dca16..7de821a3 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -537,11 +537,11 @@ Fl_Widget *UI::make_filemenu_button()
    padding = w;
    btn->copy_label(PanelSize == P_tiny ? "&F" : "&File");
    btn->measure_label(w,h);
-   h = (PanelSize == P_large) ? mh : (PanelSize == P_tiny) ? bh : lh;
+   h = (PanelSize == P_tiny) ? bh : lh;
    btn->size(w+padding, h);
    p_xpos += btn->w();
    _MSG("UI::make_filemenu_button w=%d h=%d padding=%d\n", w, h, padding);
-   btn->box(PanelSize == P_large ? FL_THIN_UP_BOX : FL_THIN_UP_BOX);
+   btn->box(FL_THIN_UP_BOX);
    btn->callback(filemenu_cb, this);
    if (prefs.show_tooltip)
       btn->tooltip("File menu");
@@ -581,11 +581,6 @@ void UI::make_panel(int ww)
          bw = 42, bh = 36, mh = 0, lh = 22, lbl = 1;
       else
          bw = 45, bh = 45, mh = 0, lh = 28, lbl = 1;
-   } else {   // P_large
-      if (Small_Icons)
-         bw = 42, bh = 36, mh = 22, lh = 22, lbl = 1;
-      else
-         bw = 45, bh = 45, mh = 24, lh = 28, lbl = 1;
    }
    nh = bh, fh = 28; sh = 20;
 
@@ -604,36 +599,17 @@ void UI::make_panel(int ww)
       NavBar->rearrange();
       TopGroup->insert(*NavBar,0);
    } else {
-       if (PanelSize == P_large) {
-          MenuBar = new CustGroupHorizontal(0,0,ww,mh);
-          MenuBar->begin();
-           MenuBar->box(FL_THIN_UP_BOX);
-           Fl_Widget *bn = make_filemenu_button();
-           MenuBar->add_resizable(*new Fl_Box(bn->w(),0,ww - bn->w(),mh));
-          MenuBar->end();
-          MenuBar->rearrange();
-          TopGroup->insert(*MenuBar,0);
-
-          p_xpos = 0;
-          LocBar = new CustGroupHorizontal(0,0,ww,lh);
-          LocBar->begin();
-           make_location(ww);
-           LocBar->resizable(Location);
-          LocBar->end();
-          LocBar->rearrange();
-          TopGroup->insert(*LocBar,1);
-       } else {
-          LocBar = new CustGroupHorizontal(0,0,ww,lh);
-          LocBar->box(FL_NO_BOX);
-          LocBar->begin();
-           p_xpos = 0;
-           make_filemenu_button();
-           make_location(ww);
-           LocBar->resizable(Location);
-          LocBar->end();
-          LocBar->rearrange();
-          TopGroup->insert(*LocBar,0);
-       }
+       // Location
+       LocBar = new CustGroupHorizontal(0,0,ww,lh);
+       LocBar->box(FL_NO_BOX);
+       LocBar->begin();
+        p_xpos = 0;
+        make_filemenu_button();
+        make_location(ww);
+        LocBar->resizable(Location);
+       LocBar->end();
+       LocBar->rearrange();
+       TopGroup->insert(*LocBar,0);
 
        // Toolbar
        p_ypos = 0;
@@ -715,7 +691,6 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) :
          Panelmode = UI_NORMAL;
    } else {
      // Set some default values
-     //PanelSize = P_tiny, CuteColor = 26, Small_Icons = 0;
      PanelSize = prefs.panel_size;
      Small_Icons = prefs.small_icons;
      CuteColor = 206;