add shortcuts to filedialogs directory buttons; small gnome patch from Michael

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3353 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 83dce7f7924f28201d8a6c44d6514bab2d72feeb..88a63c6734574417f107589e3c2d0fbcf64b8be7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-13  Michael A. Koziarski  <michael@koziarski.com>
+
+       * configure.in:  Fix the includes for gnome.
+
 2002-01-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * configure.in: change for Aiksaurus 0.14

diff --git a/configure.in b/configure.in
index 4877da3d8ee2e1448707e9a6bd0f2113b0429abd..d7d1301d327bbd7d6023aca5be1e9aa02fa968ee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -208,8 +208,8 @@ dnl Ensure gnome-config is available...
     FRONTEND="gnome"
     FRONTEND_GUILIB="gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
-    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
+    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
     QT2_DO_IT_ALL
     FRONTEND="qt2"

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index ca62780d4ab8ea23f7090fedbcc55bfa2bba6f40..8e2021b8ac83a4158edf310120dd03816be6df2c 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -1438,9 +1438,9 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
                FileDialog fileDlg(bv_->owner(),
                                   _("Select LyX document to insert"),
                        LFUN_FILE_INSERT,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Examples")),
+                       make_pair(string(_("Examples|#E#e")),
                                  string(AddPath(system_lyxdir, "examples"))));
 
                FileDialog::Result result =

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b35b334fe53778bca2afa56215daec03b4fcf14..47ec906add65b73849668cd94c9b48a7566e95fd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-13  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+       * BufferView_pimpl.C (MenuInsertLyXFile): 
+       * lyxfunc.C (menuNew): 
+       (open): 
+       (doImport): add shortcuts to directory buttons
+
        * BufferView_pimpl.C (workAreaButtonRelease): remove dead code (to
        open a float)
 

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 46bbb9390586c3a47f96f0a5a181a0d89c3e86e3..c0a02c6eb34c68345f4839cfb961a14a7747441a 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-13  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * helper_funcs.h (browseFile): add default empty button descriptions.
+
+       * ControlGraphics.C (Browse): 
+       * ControlBibtex.C (Browse): 
+       * ControlInclude.C (Browse): add shortcuts to directory buttons
+
 2002-01-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * ControlThesaurus.h:

diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index 03b6dba6beaac3ada8e895a91960e8af23be4cc9..3ac31c5ce906dd953441d9d83ba5a49f66a2cf5d 100644 (file)
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -65,7 +65,6 @@ string const ControlBibtex::Browse(string const & in_name,
                                    string const & title,
                                   string const & pattern)
 {
-       pair<string, string> dir1(N_("Documents"), string(lyxrc.document_path));
-       return browseFile(&lv_, in_name, title, pattern, 
-                         dir1,make_pair(string(), string()));
+       pair<string, string> dir1(N_("Documents|#o#O"), string(lyxrc.document_path));
+       return browseFile(&lv_, in_name, title, pattern, dir1);
 }

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index f9e357f5660b0672dc95916354decb2fa764a62e..16ab959398f0e6f6b9697766bc5f898c241fc412 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -161,7 +161,7 @@ string const ControlExternal::Browse(string const & input) const
        FileDialog fileDlg(&lv_,
                           _("Select external file"),
                           LFUN_SELECT_FILE_SYNC,
-                          make_pair(string(_("Document")), string(buf)));
+                          make_pair(string(_("Document|#o#O")), string(buf)));
        
        /// Determine the template file extension
        ExternalTemplate const & et = params().templ;

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 9aa77fa2eacfbc9e8081ba832f25a94a8f6b8fd8..6c13079749ced608abd41be664518a1e3c4139b5 100644 (file)
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -77,7 +77,7 @@ extern string user_lyxdir;
 
 string const ControlGraphics::Browse(string const & in_name)
 {
-       string const title = N_("Graphics");
+       string const title = N_("Graphics|#G#g");
        // FIXME: currently we need the second '|' to prevent mis-interpretation 
        string const pattern = "*.(eps|png|jpeg|jpg|gif)|";
 
@@ -87,9 +87,8 @@ string const ControlGraphics::Browse(string const & in_name)
        if (!(fileInfo.isOK() && fileInfo.isDir()))
                // No - bail out to system clipart directory
                clipdir = AddName (system_lyxdir, "clipart");
-       pair<string, string> dir1(N_("Clipart"), clipdir);
+       pair<string, string> dir1(N_("Clipart|#C#c"), clipdir);
        
        // Show the file browser dialog
-       return browseFile(&lv_, in_name, title, pattern, dir1,
-                         make_pair(string(), string()));
+       return browseFile(&lv_, in_name, title, pattern, dir1);
 }

diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index b81f539ea5c185efbe4faf681003dd2ed0afba17..b9775ab4a996c3ae622ea07a5d44d337f36d5415 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -67,10 +67,10 @@ string const ControlInclude::Browse(string const & in_name, Type in_type)
            break;
        }
        
-       pair<string, string> dir1(N_("Documents"), string(lyxrc.document_path));
+       pair<string, string> dir1(N_("Documents|#o#O"),
+                                 string(lyxrc.document_path));
 
-       return browseFile(&lv_, in_name, title, pattern, dir1,
-                         make_pair(string(), string()));
+       return browseFile(&lv_, in_name, title, pattern, dir1);
 }
 
 

diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index cd9cb263c41e40be510a050418ee3ea2089df4b9..a20364380d8aeed31bbf5a75d11db7136fec8b3d 100644 (file)
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -91,7 +91,5 @@ string const ControlPrint::Browse(string const & in_name)
        string const pattern = "*.ps";
 
        // Show the file browser dialog
-       return browseFile(&lv_, in_name, title, pattern,
-                          make_pair(string(), string()),
-                          make_pair(string(), string()));
+       return browseFile(&lv_, in_name, title, pattern);
 }

diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h
index d2af6683b4c0bb300537a70809ff4ef9548b9f16..095f8bb91a5715fc1d0fc97e28eac692b1d67c28 100644 (file)
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -42,8 +42,8 @@ class LyXView;
 string const browseFile(LyXView *lv, string const & filename,
                        string const & title,
                        string const & pattern, 
-                       std::pair<string,string> const & dir1,
-                       std::pair<string,string> const & dir2);
+                       std::pair<string,string> const & dir1 = std::make_pair(string(), string()),
+                       std::pair<string,string> const & dir2 = std::make_pair(string(), string()));
 
 
 /// Returns a vector of units that can be used to create a valid LaTeX length.

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 6185cccdf7c6fd557a96662b0de1643f2ffb47ce..dc2a616c6c10e08c7cbc97d88ff65a221d1b99b7 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,15 @@
+2002-01-13  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * FormPreferences.C (Interface::input): 
+       (Language::input): 
+       (Paths::input): add shortcuts to file dialogs directory buttons
+       
+       * FormPreference.h (browse): add default empty parameters for
+       buttons descriptions.
+
+       * FormFiledialog.C (SetButton): allow for a shortcut in the name
+       of the button.
+
 2002-01-13  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormThesaurus.C:

diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index 53cbf5e0420a9c613c55600b23277b09d2195ceb..0b4037da3821c95e80083b3743abff67878486a9 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -27,6 +27,8 @@ using std::sort;
 #include "support/lstrings.h"
 #include "gettext.h"
 #include "frontends/Dialogs.h"
+#include "xforms_helpers.h"
+
 
 #ifdef HAVE_ERRNO_H
 #include <cerrno>
@@ -480,7 +482,8 @@ void FileDialog::Private::SetButton(int iIndex, string const & pszName,
        } else return;
 
        if (!pszName.empty()) {
-               fl_set_object_label(pObject, pszName.c_str());
+               fl_set_object_label(pObject, idex(pszName.c_str()));
+               fl_set_button_shortcut(pObject, scex(pszName.c_str()), 1);
                fl_show_object(pObject);
                *pTemp = pszPath;
        } else {

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index 141e144791f0c9cad659cbe15935264d1295a536..0fc651e5c3989e72a10729e150bb2267a84b0214 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -76,7 +76,9 @@ void FormParagraph::changedParagraph()
        Paragraph const * const p = getCurrentParagraph();
        if (p == 0 || p == par_)
                return;
+#ifdef WITH_WARNINGS
 #warning Please someone of you GUII people have a look at this!
+#endif
        // shouldn't we chage the par_ pointer too?
        // anyway for me the below function does just nothing!
        // (Jug 20020108)

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 4502f3b953f39c1c487d78d4127e0acb3d5531b5..bf519462c6ce71700b42909f400065279ffddf07 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -1528,11 +1528,11 @@ bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
 {
        if (ob == dialog_->button_bind_file_browse) {
                string dir  = AddName(system_lyxdir, "bind");
-               string name = N_("Sys Bind");
+               string name = N_("Sys Bind|#S#s");
                pair<string,string> dir1(name, dir);
 
                dir = AddName(user_lyxdir, "bind");
-               name = N_("User Bind");
+               name = N_("User Bind|#U#u");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_bind_file,
@@ -1540,11 +1540,11 @@ bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
                
        } else if (ob == dialog_->button_ui_file_browse) {
                string dir  = AddName(system_lyxdir, "ui");
-               string name = N_("Sys UI");
+               string name = N_("Sys UI|#S#s");
                pair<string,string> dir1(name, dir);
 
                dir = AddName(user_lyxdir, "ui");
-               name = N_("User UI");
+               name = N_("User UI|#U#u");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_ui_file,
@@ -1736,20 +1736,18 @@ bool FormPreferences::Language::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_kbmap1_browse) {
                string const dir  = AddName(system_lyxdir, "kbd");
-               string const name = N_("Key maps");
+               string const name = N_("Key maps|#K#k");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap1,
-                              N_("Keyboard map"), "*.kmap", dir1,
-                              make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1);
        } else if (ob == dialog_->button_kbmap2_browse) {
                string const dir  = AddName(system_lyxdir, "kbd");
-               string const name = N_("Key maps");
+               string const name = N_("Key maps|#K#k");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap2,
-                              N_("Keyboard map"), "*.kmap", dir1,
-                              make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1);
        }
 
        return activate;
@@ -2219,35 +2217,24 @@ bool FormPreferences::Paths::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_default_path_browse) {
                parent_.browse(dialog_->input_default_path,
-                              N_("Default path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Default path"), string());
        } else if (ob == dialog_->button_template_path_browse) {
                parent_.browse(dialog_->input_template_path,
-                              N_("Template path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Template path"), string());
        } else if (ob == dialog_->button_temp_dir_browse) {
                parent_.browse(dialog_->input_temp_dir,
-                              N_("Temp dir"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Temp dir"), string());
        } else if (ob == dialog_->button_lastfiles_browse) {
-               pair<string, string> dir(_("User"), user_lyxdir);
+               pair<string, string> dir(_("User|#U#u"), user_lyxdir);
 
                parent_.browse(dialog_->input_lastfiles,
-                              N_("Lastfiles"), string(), dir,
-                              make_pair(string(), string()));
+                              N_("Lastfiles"), string(), dir);
        } else if (ob == dialog_->button_backup_path_browse) {
                parent_.browse(dialog_->input_backup_path,
-                              N_("Backup path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Backup path"), string());
        } else if (ob == dialog_->button_serverpipe_browse) {
                parent_.browse(dialog_->input_serverpipe,
-                              N_("LyX Server pipes"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("LyX Server pipes"), string());
        }
        
        return activate;
@@ -2946,9 +2933,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_personal_dict) {
                parent_.browse(dialog_->input_personal_dict,
-                              N_("Personal dictionary"), "*.ispell",
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Personal dictionary"), "*.ispell");
        }
        
        return true; // All input is valid!

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index ceeb3a09c06a9c8a41bd5bed83d34e916dd3949e..09d7e5f6ca98aa6497c735b6042aa856ee0a26a4 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -95,8 +95,8 @@ private:
         */
        void browse( FL_OBJECT * input,
                     string const & title, string const & pattern, 
-                    std::pair<string,string> const & dir1,
-                    std::pair<string,string> const & dir2 );
+                    std::pair<string,string> const & dir1= make_pair(string(),string()), 
+                    std::pair<string,string> const & dir2 = make_pair(string(),string()));
        
        /// Fdesign generated methods
        FD_form_preferences * build_preferences();

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 56493b7b4d6b939899f0bc0842732d6366ca1897..370fb1b5148b0f363619c49a19634db0cc1a9d6d 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,5 +1,7 @@
 2002-01-13  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+       * figinset.C (browseFile): add shortcuts to directory buttons
+
        * insettext.C (updateLocal): update menubar and toolbar here too.
 
 2002-01-13  Allan Rae  <rae@lyx.org>

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 659e489c974d3ab9867014ab15c571ce16c17d33..e961aec7767c7c7ea6517b91a59bba61d48e25d5 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -1979,8 +1979,8 @@ void InsetFig::browseFile()
 
        FileDialog fileDlg(current_view->owner(), _("Select an EPS figure"),
                LFUN_SELECT_FILE_SYNC,
-               make_pair(string(_("Clip art")), string(bufclip)),
-               make_pair(string(_("Documents")), string(buf)));
+               make_pair(string(_("Clip art|#C#c")), string(bufclip)),
+               make_pair(string(_("Documents|#o#O")), string(buf)));
 
        bool error = false;
        do {

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index ba2544d44549efd0ee3a7daf96321c581cb3a457..43cfb02da6d044e26f222bbdb13d2996457c6db6 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -170,9 +170,9 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
                FileDialog fileDlg(bv->owner(),
                                   _("Choose a filename to save document as"),
                        LFUN_WRITEAS,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Templates")),
+                       make_pair(string(_("Templates|#T#t")),
                                  string(lyxrc.template_path)));
 
                if (!IsLyXFilename(fname))

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index ec2eb4513b839604d39bc7e5d625ff28b03f01a9..adfe50ce56f93e9fc323694f72c12155baa3826c 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1664,9 +1664,9 @@ void LyXFunc::menuNew(bool fromTemplate)
        if (lyxrc.new_ask_filename) {
                FileDialog fileDlg(owner, _("Enter filename for new document"),
                                   LFUN_SELECT_FILE_SYNC,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Templates")),
+                       make_pair(string(_("Templates|#T#t")),
                                  string(lyxrc.template_path)));
 
                FileDialog::Result result =
@@ -1748,9 +1748,9 @@ void LyXFunc::menuNew(bool fromTemplate)
        if (fromTemplate) {
                FileDialog fileDlg(owner, _("Select template file"),
                        LFUN_SELECT_FILE_SYNC,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Templates")),
+                       make_pair(string(_("Templates|#T#t")),
                                  string(lyxrc.template_path)));
 
                FileDialog::Result result =
@@ -1789,9 +1789,9 @@ void LyXFunc::open(string const & fname)
        if (fname.empty()) {
                FileDialog fileDlg(owner, _("Select document to open"),
                        LFUN_FILE_OPEN,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Examples")),
+                       make_pair(string(_("Examples|#E#e")),
                                  string(AddPath(system_lyxdir, "examples"))));
 
                FileDialog::Result result =
@@ -1866,9 +1866,9 @@ void LyXFunc::doImport(string const & argument)
 
                FileDialog fileDlg(owner, text, 
                        LFUN_IMPORT,
-                       make_pair(string(_("Documents")),
+                       make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Examples")),
+                       make_pair(string(_("Examples|#E#e")),
                                  string(AddPath(system_lyxdir, "examples"))));
                        
                string const extension = "*." + formats.extension(format)