Mercurial > octave

changeset 27310:3e0269067954

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
combine all revert actions of load path dialog in one pulldown button * set-path-dialog.cc (set_path_dialog): remove revert last button and add menu to remaining revert button with revert and revert alst actions, remove obsolete connections of revert buttons
author Torsten Lilge <ttl-octave@mailbox.org>
date Sat, 03 Aug 2019 00:22:27 +0200
parents 463fc0cfed90
children 0040b7668518
files libgui/src/set-path-dialog.cc
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/set-path-dialog.cc	Thu Aug 01 16:54:30 2019 -0700
+++ b/libgui/src/set-path-dialog.cc	Sat Aug 03 00:22:27 2019 +0200
@@ -57,6 +57,8 @@
   {
     setWindowTitle (tr ("Set Path"));
 
+    set_path_model *model = new set_path_model (this);
+
     m_info_label = new QLabel (tr ("All changes take effect immediately."));
 
     m_add_folder_button = new QPushButton (tr ("Add Folder..."));
@@ -76,8 +78,15 @@
 
     m_reload_button = new QPushButton (tr ("Reload"));
     m_save_button = new QPushButton (tr ("Save"));
+
     m_revert_button = new QPushButton (tr ("Revert"));
-    m_revert_last_button = new QPushButton (tr ("Revert Last"));
+
+    QMenu *revert_menu = new QMenu ();
+    m_revert_button->setMenu (revert_menu);
+    revert_menu->addAction (tr ("Revert Last Change"),
+                            model, SLOT (revert_last (void)));
+    revert_menu->addAction (tr ("Revert All Changes"),
+                            model, SLOT (revert (void)));
 
     m_save_button->setFocus ();
 
@@ -96,20 +105,12 @@
     connect (m_move_down_button, SIGNAL (clicked (void)),
              this, SLOT (move_dir_down (void)));
 
-    set_path_model *model = new set_path_model (this);
-
     connect (m_reload_button, SIGNAL (clicked (void)),
              model, SLOT (path_to_model (void)));
 
     connect (m_save_button, SIGNAL (clicked (void)),
              model, SLOT (save (void)));
 
-    connect (m_revert_button, SIGNAL (clicked (void)),
-             model, SLOT (revert (void)));
-
-    connect (m_revert_last_button, SIGNAL (clicked (void)),
-             model, SLOT (revert_last (void)));
-
     m_path_list = new QListView (this);
     m_path_list->setWordWrap (false);
     m_path_list->setModel (model);
@@ -127,7 +128,6 @@
     m_close_button = button_box->addButton (QDialogButtonBox::Close);
     connect (button_box, SIGNAL (rejected (void)), this, SLOT (close (void)));
 
-    button_box->addButton (m_revert_last_button, QDialogButtonBox::ActionRole);
     button_box->addButton (m_revert_button, QDialogButtonBox::ActionRole);
 
     // path edit options