[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-02-22 18:51:38
Message-ID: 1172170298.094223.29963.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 636291 by hein:

* Make EBN happy.
* Put the .desktop file in xdg_apps_DATA from now on.
* Bounds-check DCOP's slotRenameSession.
* Apply patch by Jesús García Crespo that adds keyboard
  shortcuts to adjust the window height (and add some to
  adjust the width myself).


 M  +1 -3      Makefile.am  
 M  +1 -1      image_button.h  
 M  +67 -1     main_window.cpp  
 M  +10 -1     main_window.h  
 M  +1 -1      shell_session.h  
 M  +2 -0      tabbed_widget.cpp  
 M  +1 -1      tabbed_widget.h  
 M  +1 -1      tabs_bar.h  
 M  +1 -1      title_bar.h  


--- trunk/extragear/utils/yakuake/src/Makefile.am #636290:636291
@@ -15,9 +15,7 @@
 # set the include path for X, qt and KDE
 INCLUDES = -I$(top_srcdir)/. -I$(top_srcdir)/src $(all_includes)
 
-# this is where the desktop file will go
-shelldesktopdir = $(kde_appsdir)/Utilities
-shelldesktop_DATA = yakuake.desktop
+xdg_apps_DATA = yakuake.desktop
 
 # this is where the shell's XML-GUI resource file goes
 shellrcdir = $(kde_datadir)/yakuake
--- trunk/extragear/utils/yakuake/src/image_button.h #636290:636291
@@ -99,7 +99,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    ImageButton(QWidget * parent = 0, const char * name = 0);
+    explicit ImageButton(QWidget * parent = 0, const char * name = 0);
     ~ImageButton();
 
 
--- trunk/extragear/utils/yakuake/src/main_window.cpp #636290:636291
@@ -113,9 +113,21 @@
     action_paste = new KAction(i18n("Paste"), SHIFT + Key_Insert,
                                this, SLOT(slotPasteClipboard()),
                                actionCollection(), "paste_clipboard");
-    action_paste = new KAction(i18n("Rename Session..."), "Alt+Ctrl+S",
+    action_rename = new KAction(i18n("Rename Session..."), "Alt+Ctrl+S",
                                this, SLOT(slotInteractiveRename()),
                                actionCollection(), "edit_name");
+    action_increasew = new KAction(i18n("Increase Width"), "Alt+Shift+Right",
+                               this, SLOT(slotIncreaseSizeW()),
+                    actionCollection(), "increasew");
+    action_decreasew = new KAction(i18n("Decrease Width"), "Alt+Shift+Left",
+                               this, SLOT(slotDecreaseSizeW()),
+                    actionCollection(), "decreasew");
+    action_increaseh = new KAction(i18n("Increase Height"), "Alt+Shift+Down",
+                               this, SLOT(slotIncreaseSizeH()),
+                    actionCollection(), "increaseh");
+    action_decreaseh = new KAction(i18n("Decrease Height"), "Alt+Shift+Up",
+                               this, SLOT(slotDecreaseSizeH()),
+                    actionCollection(), "decreaseh");
 
     actionCollection()->readShortcutSettings("Shortcuts", &config);
 
@@ -157,6 +169,10 @@
     delete action_del;
     delete action_next;
     delete action_prev;
+    delete action_paste;
+    delete action_rename;
+    delete action_increaseh;
+    delete action_decreaseh;
 
     delete menu;
     delete sizeH_menu;
@@ -739,8 +755,58 @@
     slotUpdateSize();
 }
 
+/******************************************************************************
+** Increase the window's width
+****************************/
 
+void    MainWindow::slotIncreaseSizeW()
+{
+    int sizeW = this->sizeW;
+
+    if (sizeW < 100)
+        slotSetSizeW(sizeW + 10);
+}
+
+
 /******************************************************************************
+** Decrease the window's width
+****************************/
+
+void    MainWindow::slotDecreaseSizeW()
+{
+    int sizeW = this->sizeW;
+
+    if (sizeW > 10)
+        slotSetSizeW(sizeW - 10);
+}
+
+/******************************************************************************
+** Increase the window's height
+****************************/
+
+void	MainWindow::slotIncreaseSizeH()
+{
+    int sizeH = this->sizeH;
+
+    if (sizeH < 100)
+        slotSetSizeH(sizeH + 10);
+}
+
+
+/******************************************************************************
+** Decrease the window's height
+****************************/
+
+void	MainWindow::slotDecreaseSizeH()
+{
+    int sizeH = this->sizeH;
+
+    if (sizeH > 10)
+        slotSetSizeH(sizeH - 10);
+}
+
+
+/******************************************************************************
 ** Sets the window's width
 ****************************/
 
--- trunk/extragear/utils/yakuake/src/main_window.h #636290:636291
@@ -142,6 +142,11 @@
     KAction *       action_next;
     KAction *       action_prev;
     KAction *       action_paste;
+    KAction *       action_rename;
+    KAction *       action_increasew;
+    KAction *       action_decreasew;
+    KAction *       action_increaseh;
+    KAction *       action_decreaseh;
 
 
     /*
@@ -213,6 +218,10 @@
 
     void    slotSetSizeW(int);
     void    slotSetSizeH(int);
+    void    slotIncreaseSizeW();
+    void    slotDecreaseSizeW();
+    void    slotIncreaseSizeH();
+    void    slotDecreaseSizeH();
     void    slotSetSpeed(int);
     void    slotSetScreen(int);
     void    slotSetLocationH(int);
@@ -240,7 +249,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    MainWindow(QWidget * parent = 0, const char * name = 0);
+    explicit MainWindow(QWidget * parent = 0, const char * name = 0);
     ~MainWindow();
 
 
--- trunk/extragear/utils/yakuake/src/shell_session.h #636290:636291
@@ -60,7 +60,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    ShellSession(QWidget * parent = 0, const char * name = 0);
+    explicit ShellSession(QWidget * parent = 0, const char * name = 0);
     virtual ~ShellSession();
 
 
--- trunk/extragear/utils/yakuake/src/tabbed_widget.cpp #636290:636291
@@ -149,6 +149,8 @@
 {
     int index = items.findIndex(id);
 
+    if (index = -1) return;
+
     QString name = namep.stripWhiteSpace();
     captions[index] = !name.isEmpty() ? name : captions[index];
 
--- trunk/extragear/utils/yakuake/src/tabbed_widget.h #636290:636291
@@ -131,7 +131,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    TabbedWidget(QWidget * parent = 0, const char * name = 0);
+    explicit TabbedWidget(QWidget * parent = 0, const char * name = 0);
     ~TabbedWidget();
 
 
--- trunk/extragear/utils/yakuake/src/tabs_bar.h #636290:636291
@@ -116,7 +116,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    TabsBar(QWidget * parent = 0, const char * name = 0, const QString & skin = "default");
+    explicit TabsBar(QWidget * parent = 0, const char * name = 0, const QString & skin = "default");
     ~TabsBar();
 
 
--- trunk/extragear/utils/yakuake/src/title_bar.h #636290:636291
@@ -111,7 +111,7 @@
 
     //-- CONSTRUCTORS AND DESTRUCTORS -----------------------------------//
 
-    TitleBar(QWidget * parent = 0, const char * name = 0, const QString & skin = "default");
+    explicit TitleBar(QWidget * parent = 0, const char * name = 0, const QString & skin = "default");
     ~TitleBar();
 
 
[prev in list] [next in list] [prev in thread] [next in thread]