[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/utils/yakuake/src
From:       Eike Hein <hein () kde ! org>
Date:       2007-05-05 5:28:59
Message-ID: 1178342939.762611.4227.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 661299 by hein:

* Turn the multi-terminal session prefab menu items into
  actions, allowing the user to configure keyboard short-
  cuts for them.
* Update the width and height sub-menus of the main menu
  after changing the window width or height using the
  keyboard shortcuts.
* Some naming fixes.


 M  +48 -22    main_window.cpp  
 M  +3 -1      main_window.h  


--- trunk/extragear/utils/yakuake/src/main_window.cpp #661298:661299
@@ -78,6 +78,18 @@
                              this, SLOT(slotAddSession()),
                              actionCollection(), "add_tab");
 
+    action = new KAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"),
+                             0, this, SLOT(slotAddSessionTwoHorizontal()),
+                             actionCollection(), "add_tab_twohorizontal");
+
+    action = new KAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"),
+                             0, this, SLOT(slotAddSessionTwoVertical()),
+                             actionCollection(), "add_tab_twovertical");
+
+    action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"),
+                             0, this, SLOT(slotAddSessionQuad()),
+                             actionCollection(), "add_tab_quad");
+
     action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"),
                              Key_F8, this, SLOT(slotFocusNextSplit()),
                              actionCollection(), "focus_next_terminal");
@@ -319,7 +331,7 @@
     slotAddSession(Session::TwoVertical);
 }
 
-void MainWindow::slotAddSessionTwoQuad()
+void MainWindow::slotAddSessionQuad()
 {
     slotAddSession(Session::Quad);
 }
@@ -740,18 +752,28 @@
     actionCollection()->action(KStdAction::stdName(KStdAction::Preferences))->plug(menu);
 }
 
+void MainWindow::updateWidthMenu()
+{
+    width_menu->clear();
+    for (int i = 10; i <= 100; i += 10) width_menu->insertItem(QString::number(i) + '%', i);
+    width_menu->setItemChecked(Settings::width(), true);
+}
+
+void MainWindow::updateHeightMenu()
+{
+    height_menu->clear();
+    for (int i = 10; i <= 100; i += 10) height_menu->insertItem(QString::number(i) + '%', i);
+    height_menu->setItemChecked(Settings::height(), true);
+}
+
 void MainWindow::createSessionMenu()
 {
     session_menu = new KPopupMenu();
 
     actionCollection()->action("add_tab")->plug(session_menu);
-
-    session_menu->insertItem(SmallIcon("view_left_right"),
-        i18n("Two Terminals, Horizontal"), this, SLOT(slotAddSessionTwoHorizontal()));
-    session_menu->insertItem(SmallIcon("view_top_bottom"),
-        i18n("Two Terminals, Vertical"), this, SLOT(slotAddSessionTwoVertical()));
-    session_menu->insertItem(i18n("Four Terminals, Quad"),
-        this, SLOT(slotAddSessionTwoQuad()));
+    actionCollection()->action("add_tab_twohorizontal")->plug(session_menu);
+    actionCollection()->action("add_tab_twovertical")->plug(session_menu);
+    actionCollection()->action("add_tab_quad")->plug(session_menu);
 }
 
 void MainWindow::slotUpdateTitle(const QString& title)
@@ -765,9 +787,11 @@
     /* Increase the window's width. */
 
     if (Settings::width() < 100)
+    {
         Settings::setWidth(Settings::width() + 10);
-
-    slotUpdateSize();
+        updateWidthMenu();
+        slotUpdateSize();
+    }
 }
 
 void MainWindow::slotDecreaseSizeW()
@@ -775,9 +799,11 @@
     /* Decrease the window's width. */
 
     if (Settings::width() > 10)
+    {
         Settings::setWidth(Settings::width() - 10);
-
-    slotUpdateSize();
+        updateWidthMenu();
+        slotUpdateSize();
+    }
 }
 
 void MainWindow::slotIncreaseSizeH()
@@ -785,9 +811,11 @@
     /* Increase the window's height. */
 
     if (Settings::height() < 100)
+    {
         Settings::setHeight(Settings::height() + 10);
-
-    slotUpdateSize();
+        updateHeightMenu();
+        slotUpdateSize();
+    }
 }
 
 void MainWindow::slotDecreaseSizeH()
@@ -795,9 +823,11 @@
     /* Decrease the window's height. */
 
     if (Settings::height() > 10)
+    {
         Settings::setHeight(Settings::height() - 10);
-
-    slotUpdateSize();
+        updateHeightMenu();
+        slotUpdateSize();
+    }
 }
 
 void MainWindow::slotSessionDestroyed(int id)
@@ -1060,12 +1090,8 @@
     menu->setItemChecked(Focus, Settings::focus());
     title_bar->setFocusButtonEnabled(Settings::focus());
 
-    width_menu->clear();
-    height_menu->clear();
-    for (int i = 10; i <= 100; i += 10) width_menu->insertItem(QString::number(i) + '%', i);
-    for (int i = 10; i <= 100; i += 10) height_menu->insertItem(QString::number(i) + '%', i);
-    width_menu->setItemChecked(Settings::width(), true);
-    height_menu->setItemChecked(Settings::height(), true);
+    updateWidthMenu();
+    updateHeightMenu();
 
     screen_menu->clear();
     screen_menu->insertItem(i18n("At mouse location"), 0);
--- trunk/extragear/utils/yakuake/src/main_window.h #661298:661299
@@ -75,7 +75,7 @@
         void slotAddSession();
         void slotAddSessionTwoHorizontal();
         void slotAddSessionTwoVertical();
-        void slotAddSessionTwoQuad();
+        void slotAddSessionQuad();
         void slotAddSession(Session::SessionType type);
 
         void slotRemoveSession();
@@ -134,6 +134,8 @@
 
     private:
         void createMenu();
+        void updateWidthMenu();
+        void updateHeightMenu();
         void createSessionMenu();
         void createTabsBar();
         void createTitleBar();
[prev in list] [next in list] [prev in thread] [next in thread]