DropDown mode

lxqt · Jan 9, 2012 · e1f40d7 · e1f40d7
1 parent d20d44f
commit e1f40d7
Show file tree

Hide file tree

Showing 21 changed files with 1,626 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,7 @@ subdirs( src )
 
 
 install(FILES qterminal.desktop DESTINATION share/applications)
+install(FILES qterminal_drop.desktop DESTINATION share/applications)
 
 
 # make dist custom target

diff --git a/qterminal_drop.desktop b/qterminal_drop.desktop
@@ -0,0 +1,49 @@
+[Desktop Entry]
+Type=Application
+Exec=qterminal --drop
+Terminal=false
+Categories=Accessories;System Tools;Utilities;System
+Icon=terminal
+
+Name=QTerminal drop down
+GenericName=Drop-down Terminal
+
+GenericName[bg]=Падащ терминал
+GenericName[ca]=Terminal desplegable
+GenericName[ca@valencia]=Terminal desplegable
+GenericName[cs]=Vysouvací terminál
+GenericName[da]=Terminal der ruller ned
+GenericName[de]=Aufklapp-Terminal
+GenericName[en_GB]=Drop-down Terminal
+GenericName[es]=Terminal de menú desplegable
+GenericName[et]=Lahtikeriv terminal
+GenericName[fr]=Terminal déroulant
+GenericName[hr]=Spuštajući terminal
+GenericName[hu]=Legördülő terminál
+GenericName[it]=Terminale a discesa
+GenericName[ja]=ドロップダウン式ターミナル
+GenericName[km]=ស្ថានីយទម្លាក់ចុះ
+GenericName[ko]=위에서 내려오는 터미널
+GenericName[nb]=Nedtrekksterminal
+GenericName[nds]=Utklapp-Konsool
+GenericName[nl]=Uitvouwbare terminalemulator
+GenericName[pa]=ਲਟਕਦਾ ਟਰਮੀਨਲ
+GenericName[pt]=Terminal Deslizante
+GenericName[pt_BR]=Terminal suspenso
+GenericName[ro]=Terminal derulant
+
+GenericName[ru]=Выпадающий терминал
+Comment[ru]=Вападающий эмулятор терминала.
+
+GenericName[sk]=Rozbaľovací terminál
+GenericName[sv]=Rullgardinsterminal
+GenericName[th]=เทอร์มินัลแบบหย่อนลง
+GenericName[tr]=Yukarıdan Açılan Uçbirim
+GenericName[uk]=Спадний термінал
+GenericName[x-test]=xxDrop-down Terminalxx
+GenericName[zh_CN]=拉幕式终端
+GenericName[zh_TW]=下拉式終端機
+
+Comment=A drop-down terminal emulator.
+
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,14 +8,33 @@ set( QTERM_SRC
     termwidgetholder.cpp
     properties.cpp
     propertiesdialog.cpp
+    third-party/globalshortcutmanager.cpp
 )
 
+if(WIN32)
+    set(QTERM_SRC
+        ${QTERM_SRC}
+        third-party/globalshortcutmanager_win.cpp
+    )
+elseif(APPLE)
+    set(QTERM_SRC
+        ${QTERM_SRC}
+        third-party/globalshortcutmanager_mac.cpp
+    )
+else()
+    set(QTERM_SRC
+        ${QTERM_SRC}
+        third-party/globalshortcutmanager_x11.cpp
+    )
+endif()
+
 set( QTERM_MOC_SRC
 	mainwindow.h
 	tabwidget.h
     termwidget.h
     termwidgetholder.h
     propertiesdialog.h
+    third-party/globalshortcuttrigger.h
 )
 
 set( QTERM_UI_SRC

diff --git a/src/forms/propertiesdialog.ui b/src/forms/propertiesdialog.ui
@@ -59,6 +59,11 @@
        <string>Shortcuts</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>DropDown</string>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="0" column="1">
@@ -67,7 +72,7 @@
       <enum>QFrame::Box</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="fontPage">
       <layout class="QGridLayout" name="gridLayout_2">
@@ -362,6 +367,77 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QCheckBox" name="dropShowOnStartCheckBox">
+         <property name="text">
+          <string>Show on start</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Size</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <layout class="QFormLayout" name="formLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="dropHeightLabel">
+              <property name="text">
+               <string>Height %:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QSpinBox" name="dropHeightSpinBox"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="dropWidthLabel">
+              <property name="text">
+               <string>Width %:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="dropWidthSpinBox"/>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="dropShortCutLabel">
+           <property name="text">
+            <string>Shortcut:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="dropShortCutEdit"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>78</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">

diff --git a/src/icons.qrc b/src/icons.qrc
@@ -8,5 +8,7 @@
     <file>icons/document-close.png</file>
     <file>icons/application-exit.png</file>
     <file>icons/qterminal.png</file>
+    <file>icons/locked.png</file>
+    <file>icons/notlocked.png</file>
   </qresource>
 </RCC>
diff --git a/src/icons/locked.png b/src/icons/locked.png
diff --git a/src/icons/notlocked.png b/src/icons/notlocked.png
diff --git a/src/main.cpp b/src/main.cpp
@@ -29,13 +29,14 @@
 
 #define out
 
-const char* const short_options = "vhw:e:";
+const char* const short_options = "vhw:e:d";
 
 const struct option long_options[] = {
     {"version", 0, NULL, 'v'},
     {"help",    0, NULL, 'h'},
     {"workdir", 1, NULL, 'w'},
     {"execute", 1, NULL, 'e'},
+    {"drop",    0, NULL, 'd'},
     {NULL,      0, NULL,  0}
 };
 
@@ -48,6 +49,7 @@ void print_usage_and_exit(int code)
     puts("-v|--version            Prints application version and exits");
     puts("-w|--workdir <dir>      Start session with specified work directory");
     puts("-e|--execute <command>  Execute command instead of shell");
+    puts("-d|--drop               Start in Drop Mode, like Yakuake or Tilda");
     puts("\nHomepage: http://qterminal.sourceforge.net/");
     puts("Feature requests, bug reports etc please send to: <petr@scribus.info>\n");
     exit(code);
@@ -59,9 +61,10 @@ void print_version_and_exit(int code=0)
     exit(code);
 }
 
-void parse_args(int argc, char* argv[], QString& workdir, QString & shell_command)
+void parse_args(int argc, char* argv[], QString& workdir, QString & shell_command, out bool& dropMode)
 {
     int next_option;
+    dropMode = false;
     do{
         next_option = getopt_long(argc, argv, short_options, long_options, NULL);
         switch(next_option)
@@ -74,6 +77,9 @@ void parse_args(int argc, char* argv[], QString& workdir, QString & shell_comman
             case 'e':
                 shell_command = QString(optarg);
                 break;
+            case 'd':
+                dropMode = true;
+                break;
             case '?':
                 print_usage_and_exit(1);
             case 'v':
@@ -88,13 +94,20 @@ int main(int argc, char *argv[])
     setenv("TERM", "xterm", 1);
     QApplication app(argc, argv);
     QString workdir, shell_command;
-    parse_args(argc, argv, workdir, shell_command);
+    bool dropMode;
+    parse_args(argc, argv, workdir, shell_command, dropMode);
 
     if (workdir.isEmpty())
         workdir = QDir::homePath();
 
-    MainWindow widget(workdir, shell_command);
-    widget.show();
+    MainWindow widget(workdir, shell_command, dropMode);
+    if (!widget.dropMode() ||
+        Properties::Instance()->dropShowOnStart
+       )
+    {
+        widget.show();
+    }
 
     return app.exec();
+    qDebug() << Q_FUNC_INFO;
 }