diff --git a/ChangeLog b/ChangeLog index 8b495a0..154b7d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + Added topMenu option (by Hildigerr Vergaray) version 3.1 require Lua 5.3 disable menubar on F10 diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 72bbe95..d4b78f3 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -233,6 +233,7 @@ pre. Example: enable Gnome-like tab switching * tabName - default tab name * tabPos - tabbar position (Top, Bottom, Left, Right) * tabs - table with items of TermitTabInfo type +* topMenu - place the menubar at the top of the window * urgencyOnBell - set WM-hint 'urgent' on termit window when bell * wordCharExceptions - additional word characters (double click selects word) diff --git a/doc/rc.lua.example b/doc/rc.lua.example index 80866c0..0040d76 100644 --- a/doc/rc.lua.example +++ b/doc/rc.lua.example @@ -20,6 +20,7 @@ defaults.hideSingleTab = false defaults.hideTabbar = false defaults.showBorder = true defaults.hideMenubar = false +defaults.topMenu = false defaults.fillTabbar = true defaults.scrollbackLines = 4096 defaults.geometry = '80x24' diff --git a/doc/termit.1 b/doc/termit.1 index 7ee6f88..d98dfa6 100644 --- a/doc/termit.1 +++ b/doc/termit.1 @@ -408,6 +408,7 @@ For detailed description look into Vte docs. tabName default tab name tabPos tabbar position (Top, Bottom, Left, Right) tabs table with items of TermitTabInfo type + topMenu place menubar at the top of the window urgencyOnBell set WM\(hyhint 'urgent' on termit window when bell wordCharExceptions additional word characters (double click selects word) .P diff --git a/etc/termit/rc.lua b/etc/termit/rc.lua index 6a62ec8..2e1aca4 100644 --- a/etc/termit/rc.lua +++ b/etc/termit/rc.lua @@ -12,6 +12,7 @@ defaults.hideSingleTab = false defaults.showScrollbar = true defaults.fillTabbar = false defaults.hideMenubar = false +defaults.topMenu = false defaults.allowChangingTitle = false defaults.audibleBell = false defaults.urgencyOnBell = false diff --git a/po/de.po b/po/de.po index 81bd804..2c176db 100644 --- a/po/de.po +++ b/po/de.po @@ -33,19 +33,19 @@ msgid "Cannot parse command. Creating tab with shell" msgstr "" "Konnte Befehl nicht untersuchen. Erstelle einen Tab mit der Kommandozeile" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Bearbeiten" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Datei" @@ -58,41 +58,41 @@ msgid "Foreground" msgstr "Vordergrund" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Sitzung öffnen" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Sitzung speichern" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Bildlaufleiste" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Sitzungen" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Tab-Namen setzen..." diff --git a/po/es.po b/po/es.po index 24a410b..b43acfe 100644 --- a/po/es.po +++ b/po/es.po @@ -31,19 +31,19 @@ msgstr "No se puede crear una nueva pestaña" msgid "Cannot parse command. Creating tab with shell" msgstr "El comando no se entiende. Creando una nueva pestaña con shell" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Editar" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Archivo" @@ -56,41 +56,41 @@ msgid "Foreground" msgstr "Frente" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Abrir sesión" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Guardar sesión" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Barra de desplazamiento" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Sesiones" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Establece el nombre de la pestaña" diff --git a/po/fr.po b/po/fr.po index 8b8e963..6cc87fe 100644 --- a/po/fr.po +++ b/po/fr.po @@ -28,19 +28,19 @@ msgstr "Impossible de créer un nouvel onglet" msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Éditer" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Fichier" @@ -53,41 +53,41 @@ msgid "Foreground" msgstr "" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Ouvrir une session" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Enregistrer la session" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Sessions" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Définir le nom de l'onglet..." diff --git a/po/hu.po b/po/hu.po index 7f543ad..b913124 100644 --- a/po/hu.po +++ b/po/hu.po @@ -33,19 +33,19 @@ msgid "Cannot parse command. Creating tab with shell" msgstr "" "Nem lehetséges a parancs értelmezése. Fül létrehozása shell segítségével" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Szerkesztés" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Fájl" @@ -58,41 +58,41 @@ msgid "Foreground" msgstr "Előtér" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Megnyitás" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Mentés" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Gördítősáv" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Munkamenetek" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Fül átnevezése..." diff --git a/po/ja.po b/po/ja.po index 2b9abea..1820715 100644 --- a/po/ja.po +++ b/po/ja.po @@ -29,19 +29,19 @@ msgstr "新しいタブを作成できません" msgid "Cannot parse command. Creating tab with shell" msgstr "コマンドを解析できません。シェル経由でタブを作成します" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "編集" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "ファイル" @@ -54,41 +54,41 @@ msgid "Foreground" msgstr "前景" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "セッションを開く" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "セッションを保存する" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "スクロールバー" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "セッション" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "タブ名を設定する" diff --git a/po/ko.po b/po/ko.po index 89744bb..ab9c86a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -28,19 +28,19 @@ msgstr "새 탭을 만들 수 없습니다" msgid "Cannot parse command. Creating tab with shell" msgstr "명령을 해석할 수 없습니다. 쉘을 이용한 새 탭을 만듭니다" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "편집" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "파일" @@ -53,41 +53,41 @@ msgid "Foreground" msgstr "" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "세션 열기" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "세션 저장" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "스크롤 바" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "세션" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "탭 이름 바꾸기" diff --git a/po/pl.po b/po/pl.po index 7d6dfe9..41a97be 100644 --- a/po/pl.po +++ b/po/pl.po @@ -33,19 +33,19 @@ msgstr "Nie można utworzyć nowej karty" msgid "Cannot parse command. Creating tab with shell" msgstr "Nie można przetworzyć polecenia. Tworzenia karty z powłoki" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Edycja" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Plik" @@ -58,41 +58,41 @@ msgid "Foreground" msgstr "Pierwszy plan" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Otwórz sesje" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Zapisz sesje " -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Pasek przewijania" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Sesja" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Ustaw nazwe karty..." diff --git a/po/ru.po b/po/ru.po index 783e442..e0ad518 100644 --- a/po/ru.po +++ b/po/ru.po @@ -32,19 +32,19 @@ msgstr "Ошибка открытия новой вкладки" msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Правка" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Файл" @@ -57,41 +57,41 @@ msgid "Foreground" msgstr "" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "Открыть сессию" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Сохранить сессию" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Полоса прокрутки" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Сессии" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Заголовок вкладки" diff --git a/po/sv.po b/po/sv.po index c948a5b..25312c3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,19 +14,19 @@ msgstr "Kan inte skapa ny flik" msgid "Cannot parse command. Creating tab with shell" msgstr "Kan inte tolka kommando. Skapar interaktiv flik." -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "Redigera" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "Arkiv" @@ -39,41 +39,41 @@ msgid "Foreground" msgstr "Frgrund" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "ppna arbetspass" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "Spara arbetspass" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "Rullningslist" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "Arbetspass" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "Namnge fliken..." diff --git a/po/zh_TW.po b/po/zh_TW.po index 2d5fec5..ecafd54 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -29,19 +29,19 @@ msgstr "無法建立新分頁" msgid "Cannot parse command. Creating tab with shell" msgstr "" -#: src/termit.c:187 src/termit.c:226 +#: src/termit.c:189 src/termit.c:228 msgid "Copy" msgstr "" -#: src/termit.c:170 src/termit.c:223 +#: src/termit.c:172 src/termit.c:225 msgid "Delete" msgstr "" -#: src/termit.c:190 +#: src/termit.c:192 msgid "Edit" msgstr "編輯" -#: src/termit.c:173 +#: src/termit.c:175 msgid "File" msgstr "檔案" @@ -54,41 +54,41 @@ msgid "Foreground" msgstr "" #. File menu -#: src/termit.c:169 src/termit.c:222 +#: src/termit.c:171 src/termit.c:224 msgid "Open" msgstr "" #. Sessions menu -#: src/termit.c:202 src/callbacks.c:395 +#: src/termit.c:204 src/callbacks.c:395 msgid "Open session" msgstr "開啟作業階段" -#: src/termit.c:188 src/termit.c:227 +#: src/termit.c:190 src/termit.c:229 msgid "Paste" msgstr "" -#: src/termit.c:186 src/termit.c:225 src/termit_preferences.c:166 +#: src/termit.c:188 src/termit.c:227 src/termit_preferences.c:166 msgid "Preferences" msgstr "" -#: src/termit.c:171 src/termit.c:228 +#: src/termit.c:173 src/termit.c:230 msgid "Quit" msgstr "" -#: src/termit.c:203 src/callbacks.c:365 +#: src/termit.c:205 src/callbacks.c:365 msgid "Save session" msgstr "儲存作業階段" -#: src/termit.c:229 +#: src/termit.c:231 msgid "Scrollbar" msgstr "" -#: src/termit.c:205 +#: src/termit.c:207 msgid "Sessions" msgstr "作業階段" #. Edit menu -#: src/termit.c:185 src/termit.c:224 +#: src/termit.c:187 src/termit.c:226 msgid "Set tab name..." msgstr "設定分頁名稱..." diff --git a/src/configs.c b/src/configs.c index ae1fb84..a8295a4 100644 --- a/src/configs.c +++ b/src/configs.c @@ -115,6 +115,7 @@ void termit_config_trace() TRACE(" default_encoding = %s", configs.default_encoding); TRACE(" default_word_char_exceptions = %s", configs.default_word_char_exceptions); TRACE(" show_scrollbar = %d", configs.show_scrollbar); + TRACE(" top_menu = %d", configs.top_menu); TRACE(" hide_menubar = %d", configs.hide_menubar); TRACE(" hide_tabbar = %d", configs.hide_tabbar); TRACE(" fill_tabbar = %d", configs.fill_tabbar); @@ -179,6 +180,7 @@ void termit_configs_set_defaults() configs.hide_single_tab = FALSE; configs.show_scrollbar = TRUE; configs.fill_tabbar = FALSE; + configs.top_menu = FALSE; configs.hide_menubar = FALSE; configs.hide_tabbar = FALSE; configs.show_border = TRUE; diff --git a/src/configs.h b/src/configs.h index 3866923..f2e41e1 100644 --- a/src/configs.h +++ b/src/configs.h @@ -47,6 +47,7 @@ struct Configs gboolean hide_titlebar_when_maximized; gboolean hide_single_tab; gboolean show_scrollbar; + gboolean top_menu; gboolean hide_menubar; gboolean hide_tabbar; gboolean fill_tabbar; diff --git a/src/lua_conf.c b/src/lua_conf.c index 8498aa9..d9b85e4 100644 --- a/src/lua_conf.c +++ b/src/lua_conf.c @@ -251,6 +251,8 @@ void termit_lua_options_loader(const gchar* name, lua_State* ls, int index, void termit_config_get_color(&p_cfg->style.foreground_color, ls, index); } else if (!strcmp(name, "backgroundColor")) { termit_config_get_color(&p_cfg->style.background_color, ls, index); + } else if (!strcmp(name, "topMenu")) { + termit_config_get_boolean(&(p_cfg->top_menu), ls, index); } else if (!strcmp(name, "showScrollbar")) { termit_config_get_boolean(&(p_cfg->show_scrollbar), ls, index); } else if (!strcmp(name, "fillTabbar")) { diff --git a/src/termit.c b/src/termit.c index d205398..ba42a54 100644 --- a/src/termit.c +++ b/src/termit.c @@ -83,18 +83,20 @@ static void create_search(struct TermitData* termit) static void pack_widgets() { + termit.vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); termit.hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start(GTK_BOX(termit.hbox), termit.menu_bar, FALSE, 0, 0); + + gtk_box_pack_start(GTK_BOX(configs.top_menu?termit.vbox:termit.hbox), termit.menu_bar, FALSE, 0, 0); + gtk_box_pack_start(GTK_BOX(termit.hbox), termit.b_toggle_search, FALSE, 0, 0); gtk_box_pack_start(GTK_BOX(termit.hbox), termit.search_entry, FALSE, 0, 0); gtk_box_pack_start(GTK_BOX(termit.hbox), termit.b_find_prev, FALSE, 0, 0); gtk_box_pack_start(GTK_BOX(termit.hbox), termit.b_find_next, FALSE, 0, 0); gtk_box_pack_start(GTK_BOX(termit.hbox), termit.statusbar, TRUE, 1, 0); - GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start(GTK_BOX(vbox), termit.notebook, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox), termit.hbox, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(termit.main_window), vbox); + gtk_box_pack_start(GTK_BOX(termit.vbox), termit.notebook, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(termit.vbox), termit.hbox, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(termit.main_window), termit.vbox); if (!gtk_notebook_get_n_pages(GTK_NOTEBOOK(termit.notebook))) { termit_append_tab(); } diff --git a/src/termit.h b/src/termit.h index 720c3fe..7f8a990 100644 --- a/src/termit.h +++ b/src/termit.h @@ -41,6 +41,7 @@ struct TermitData GtkWidget *cb_bookmarks; GtkWidget *menu; GtkWidget *mi_show_scrollbar; + GtkWidget *vbox; GtkWidget *hbox; GtkWidget *menu_bar; gint tab_max_number; diff --git a/src/termit_core_api.c b/src/termit_core_api.c index f0ca2b7..cd50406 100644 --- a/src/termit_core_api.c +++ b/src/termit_core_api.c @@ -195,7 +195,7 @@ void termit_after_show_all() void termit_reconfigure() { gtk_widget_destroy(termit.menu); - gtk_container_remove(GTK_CONTAINER(termit.hbox), termit.menu_bar); + gtk_container_remove(GTK_CONTAINER(configs.top_menu?termit.vbox:termit.hbox), termit.menu_bar); termit_config_deinit(); termit_configs_set_defaults(); @@ -204,8 +204,8 @@ void termit_reconfigure() termit_create_popup_menu(); termit_create_menubar(); - gtk_box_pack_start(GTK_BOX(termit.hbox), termit.menu_bar, FALSE, 0, 0); - gtk_box_reorder_child(GTK_BOX(termit.hbox), termit.menu_bar, 0); + gtk_box_pack_start(GTK_BOX(configs.top_menu?termit.vbox:termit.hbox), termit.menu_bar, FALSE, 0, 0); + gtk_box_reorder_child(GTK_BOX(configs.top_menu?termit.vbox:termit.hbox), termit.menu_bar, 0); gtk_widget_show_all(termit.main_window); termit_after_show_all(); }