- Implemented tabbed browsing.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/ui.hh b/src/ui.hh
index d99bfef4..45659aba 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -12,6 +12,7 @@
 #include <fltk/Image.h>
 #include <fltk/MultiImage.h>
 #include <fltk/MenuBuild.h>
+#include <fltk/TabGroup.h>
 
 #include "findbar.hh"
 
@@ -36,18 +37,22 @@ typedef enum {
 } UIPanelmode;
 
 // Private class 
-class NewProgressBox;
+class CustProgressBox;
 
 //
 // UI class definition -------------------------------------------------------
 //
-class UI : public fltk::Window {
+class UI : public fltk::Group {
+   void *Bw;
+   TabGroup *Tabs;
+   char *TabTooltip;
+
    Group *TopGroup;
    Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks,
           *Clear, *Search, *FullScreen, *ImageLoad, *BugMeter;
    Input  *Location;
    PackedGroup *ProgBox;
-   NewProgressBox *PProg, *IProg;
+   CustProgressBox *PProg, *IProg;
    Image *ImgLeftIns, *ImgLeftSens, *ImgRightIns, *ImgRightSens,
          *ImgStopIns, *ImgStopSens, *ImgFullScreenOn, *ImgFullScreenOff,
          *ImgImageLoadOn, *ImgImageLoadOff, *ImgMeterOK, *ImgMeterBug,
@@ -75,7 +80,7 @@ class UI : public fltk::Window {
    void delete_status_panel_images();
 public:
 
-   UI(int w, int h, const char* label = 0, const UI *cur_ui = NULL);
+   UI(int x,int y,int w,int h, const char* label = 0, const UI *cur_ui=NULL);
    ~UI();
 
    // To manage what events to catch and which to let pass
@@ -84,6 +89,7 @@ public:
    const char *get_location();
    void set_location(const char *str);
    void focus_location();
+   void focus_main();
    void set_status(const char *str);
    void set_page_prog(size_t nbytes, int cmd);
    void set_img_prog(int n_img, int t_img, int cmd);
@@ -96,10 +102,14 @@ public:
    void set_panelmode(UIPanelmode mode);
    UIPanelmode get_panelmode();
    void set_findbar_visibility(bool visible);
-
    Widget *fullscreen_button() { return FullScreen; }
    void fullscreen_toggle() { FullScreen->do_callback(); }
 
+   TabGroup *tabs() { return Tabs; }
+   void tabs(TabGroup *tabs) { Tabs = tabs; }
+   void *vbw() { return Bw; }
+   void vbw(void *v_bw) { Bw = v_bw; }
+
    // Hooks to method callbacks
    void panel_cb_i();
    void color_change_cb_i();