diff -Nru sakura-3.8.4/AUTHORS sakura-3.8.5/AUTHORS --- sakura-3.8.4/AUTHORS 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/AUTHORS 2022-03-30 21:07:59.000000000 +0000 @@ -17,6 +17,7 @@ Costin Chirvasuta Isratine Citizen Álex Cornejo + Fabio Cobianchi Eric Davis Fabio Di Matteo Nicola Fontana @@ -50,6 +51,7 @@ Páder Rezső Aurélien Riviere Andreas Rönnquist + Ildar Sagdejev Iñigo Serna Andrew Starr-Bochicchio Tenzing diff -Nru sakura-3.8.4/CMakeLists.txt sakura-3.8.5/CMakeLists.txt --- sakura-3.8.4/CMakeLists.txt 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/CMakeLists.txt 2022-03-30 21:07:59.000000000 +0000 @@ -2,7 +2,7 @@ CMAKE_POLICY(SET CMP0005 NEW) PROJECT (sakura) SET (AUTHOR "David Gómez Espinosa" INTERNAL "Author") -SET (VERSION "3.8.3") +SET (VERSION "3.8.5") INCLUDE (FindPkgConfig) diff -Nru sakura-3.8.4/debian/changelog sakura-3.8.5/debian/changelog --- sakura-3.8.4/debian/changelog 2021-10-19 13:54:05.000000000 +0000 +++ sakura-3.8.5/debian/changelog 2022-04-01 07:46:05.000000000 +0000 @@ -1,3 +1,11 @@ +sakura (3.8.5-1) unstable; urgency=medium + + * New upstream version 3.8.5 + - Fixes incorrect usage of PRIMARY and CLIPBOARD selections + (Closes: #997023) + + -- Andreas Rönnquist Fri, 01 Apr 2022 09:46:05 +0200 + sakura (3.8.4-1) unstable; urgency=medium * New upstream version 3.8.4 diff -Nru sakura-3.8.4/po/ca.po sakura-3.8.5/po/ca.po --- sakura-3.8.4/po/ca.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/ca.po 2022-03-30 21:07:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-09-30 05:43+0000\n" "Last-Translator: Adolfo Jayme \n" "Language-Team: Jordi Jané Cardo \n" @@ -157,8 +157,17 @@ msgid "Select colors..." msgstr "Sel·leccionar colors..." -msgid "Always show tab bar" -msgstr "Mostra sempre la barra de pestanyes" +msgid "Show tab bar" +msgstr "Mostra la barra de pestanyes" + +msgid "Always" +msgstr "Sempre" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "Pestanyes a la part baixa." @@ -169,7 +178,7 @@ msgid "Show scrollbar" msgstr "Mostrar la barra de desplaçament" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" msgid "Set urgent bell" @@ -184,9 +193,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "Activar atenuació de focus" - msgid "Set cursor type" msgstr "Definir el tipus de cursor" @@ -231,3 +237,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "La versió de sakura és %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Activar atenuació de focus" diff -Nru sakura-3.8.4/po/cs.po sakura-3.8.5/po/cs.po --- sakura-3.8.4/po/cs.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/cs.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 2.3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-05-03 16:14+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Czech \n" @@ -159,8 +159,17 @@ msgid "Select colors..." msgstr "Zvolte barvy…" -msgid "Always show tab bar" -msgstr "Vždy zobrazit lištu karet" +msgid "Show tab bar" +msgstr "Zobrazit lištu karet" + +msgid "Always" +msgstr "Vždy" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "Panely dole" @@ -171,7 +180,7 @@ msgid "Show scrollbar" msgstr "Zobrazit posuvník" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" msgid "Set urgent bell" @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "" - msgid "Set cursor type" msgstr "Nastavit typ kurzoru" diff -Nru sakura-3.8.4/po/de.po sakura-3.8.5/po/de.po --- sakura-3.8.4/po/de.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/de.po 2022-03-30 21:07:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sakura 2.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2020-05-06 05:00+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Deutsch \n" @@ -160,8 +160,17 @@ msgid "Select colors..." msgstr "Farben auswählen …" -msgid "Always show tab bar" -msgstr "Reiterleiste immer anzeigen" +msgid "Show tab bar" +msgstr "Reiterleiste anzeigen" + +msgid "Always" +msgstr "Immer" + +msgid "When there's more than one tab" +msgstr "Wenn es mehrere sind" + +msgid "Never" +msgstr "Niemals" msgid "Tabs at bottom" msgstr "Reiter unten" @@ -172,7 +181,7 @@ msgid "Show scrollbar" msgstr "Bildlaufleiste anzeigen" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "Weniger Fragen bei Beenden des Programms" msgid "Set urgent bell" @@ -187,9 +196,6 @@ msgid "Disable numbered tabswitch" msgstr "Den Umschalter für nummerierte Reiter deaktivieren" -msgid "Enable focus fade" -msgstr "Langsames Einblenden aktivieren" - msgid "Set cursor type" msgstr "Cusror-Art setzen" @@ -235,3 +241,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "Sakura-Version ist %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Langsames Einblenden aktivieren" diff -Nru sakura-3.8.4/po/en_GB.po sakura-3.8.5/po/en_GB.po --- sakura-3.8.4/po/en_GB.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/en_GB.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-08-12 16:54+0000\n" "Last-Translator: David Gómez \n" "Language-Team: English (United Kingdom) \n" @@ -159,8 +159,17 @@ msgid "Select colors..." msgstr "Select colours..." -msgid "Always show tab bar" -msgstr "Always show tab bar" +msgid "Show tab bar" +msgstr "Show tab bar" + +msgid "Always" +msgstr "Always" + +msgid "When there's more than one tab" +msgstr "When there's more than one tab" + +msgid "Never" +msgstr "Never" msgid "Tabs at bottom" msgstr "Tabs at bottom" @@ -171,8 +180,8 @@ msgid "Show scrollbar" msgstr "Show scrollbar" -msgid "Less questions at exit time" -msgstr "Less questions at exit time" +msgid "Fewer questions at exit time" +msgstr "Fewer questions at exit time" msgid "Set urgent bell" msgstr "Set urgent bell" @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "Disable numbered tabswitch" -msgid "Enable focus fade" -msgstr "Enable focus fade" - msgid "Set cursor type" msgstr "Set cursor type" @@ -233,3 +239,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura version is %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Enable focus fade" diff -Nru sakura-3.8.4/po/es.po sakura-3.8.5/po/es.po --- sakura-3.8.4/po/es.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/es.po 2022-03-30 21:07:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 14:13-0500\n" "PO-Revision-Date: 2019-08-12 16:53+0000\n" "Last-Translator: David Gómez \n" "Language-Team: \n" @@ -157,8 +157,17 @@ msgid "Select colors..." msgstr "Seleccionar colores..." -msgid "Always show tab bar" -msgstr "Mostrar siempre la barra de pestañas" +msgid "Show tab bar" +msgstr "Mostrar la barra de pestañas" + +msgid "Always" +msgstr "Siempre" + +msgid "When there's more than one tab" +msgstr "Cuando hay más de una pestaña" + +msgid "Never" +msgstr "Nunca" msgid "Tabs at bottom" msgstr "Pestañas en la parte inferior" @@ -169,7 +178,7 @@ msgid "Show scrollbar" msgstr "Mostrar barra de desplazamiento" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "Menos preguntas al cerrar" msgid "Set urgent bell" @@ -184,9 +193,6 @@ msgid "Disable numbered tabswitch" msgstr "Desactivar números para cambio de pestañas" -msgid "Enable focus fade" -msgstr "Activar atenuación de foco" - msgid "Set cursor type" msgstr "Establecer tipo de cursor" @@ -228,7 +234,9 @@ msgid "- vte-based terminal emulator" msgstr "- emulador de terminal basado en libvte" -# c-format #, c-format msgid "sakura version is %s\n" msgstr "La versión de sakura es %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Activar atenuación de foco" diff -Nru sakura-3.8.4/po/fr.po sakura-3.8.5/po/fr.po --- sakura-3.8.4/po/fr.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/fr.po 2022-03-30 21:07:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: sakura 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: \n" @@ -158,8 +158,17 @@ msgid "Select colors..." msgstr "Sélectionner les couleurs..." -msgid "Always show tab bar" -msgstr "Toujours afficher la barre d'onglets" +msgid "Show tab bar" +msgstr "Afficher la barre d'onglets" + +msgid "Always" +msgstr "Toujours " + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "Rien" msgid "Tabs at bottom" msgstr "Onglets en bas" @@ -170,7 +179,7 @@ msgid "Show scrollbar" msgstr "Afficher la barre de défilement" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "Moins de questions au moment de la sortie" msgid "Set urgent bell" @@ -185,9 +194,6 @@ msgid "Disable numbered tabswitch" msgstr "Désactiver les nombres pour le changement d'onglet" -msgid "Enable focus fade" -msgstr "Activer le fondu de la mise au point" - msgid "Set cursor type" msgstr "Définir le type de curseur" @@ -232,3 +238,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "Sakura version %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Activer le fondu de la mise au point" diff -Nru sakura-3.8.4/po/he.po sakura-3.8.5/po/he.po --- sakura-3.8.4/po/he.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/he.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 3.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Rahut \n" @@ -183,8 +183,18 @@ msgid "Select colors..." msgstr "בחר צבעים..." -msgid "Always show tab bar" -msgstr "הצג תמיד סרגל כרטיסיות" +# msgstr "הצג תמיד סרגל כרטיסיות" +msgid "Show tab bar" +msgstr "" + +msgid "Always" +msgstr "" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "כרטיסיות בתחתית" @@ -195,7 +205,7 @@ msgid "Show scrollbar" msgstr "הצג פס גלילה" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" #, fuzzy @@ -211,9 +221,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "" - msgid "Set cursor type" msgstr "קבע טיפוס סמן" diff -Nru sakura-3.8.4/po/hr.po sakura-3.8.5/po/hr.po --- sakura-3.8.4/po/hr.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/hr.po 2022-03-30 21:07:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sakura 2.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2020-05-06 05:00+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: \n" @@ -160,8 +160,17 @@ msgid "Select colors..." msgstr "Odaberi boje …" -msgid "Always show tab bar" -msgstr "Uvijek prikaži traku s karticama" +msgid "Show tab bar" +msgstr "Prikaži traku s karticama" + +msgid "Always" +msgstr "Uvijek" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "Kartice dolje" @@ -172,7 +181,7 @@ msgid "Show scrollbar" msgstr "Prikaži kliznu traku" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "Manje pitanja pri zatvaranju programa" msgid "Set urgent bell" @@ -187,9 +196,6 @@ msgid "Disable numbered tabswitch" msgstr "Deaktiviraj prekidač numeriranih kartica" -msgid "Enable focus fade" -msgstr "Aktiviraj postupni prijelaz" - msgid "Set cursor type" msgstr "Postavi vrstu pokazivača" @@ -235,6 +241,9 @@ msgid "sakura version is %s\n" msgstr "sakura verzija je %s\n" +#~ msgid "Enable focus fade" +#~ msgstr "Aktiviraj postupni prijelaz" + #~ msgid "More" #~ msgstr "Više" diff -Nru sakura-3.8.4/po/hu.po sakura-3.8.5/po/hu.po --- sakura-3.8.4/po/hu.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/hu.po 2022-03-30 21:07:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: hu\n" @@ -160,8 +160,17 @@ msgid "Select colors..." msgstr "Színek kiválasztása..." -msgid "Always show tab bar" -msgstr "Mindig jelenjen meg a fülsáv" +msgid "Show tab bar" +msgstr "Jelenjen meg a fülsáv" + +msgid "Always" +msgstr "Mindig" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "Fülek alul" @@ -172,7 +181,7 @@ msgid "Show scrollbar" msgstr "Görgetősáv megjelenítése" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" msgid "Set urgent bell" @@ -187,10 +196,6 @@ msgid "Disable numbered tabswitch" msgstr "Gyorsbillentyűs fülváltás tiltása" -#, fuzzy -msgid "Enable focus fade" -msgstr "Vastag betű engedélyezése" - msgid "Set cursor type" msgstr "Kurzor típusának beállítása" @@ -236,3 +241,7 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura verzió: %s\n" + +#, fuzzy +#~ msgid "Enable focus fade" +#~ msgstr "Vastag betű engedélyezése" diff -Nru sakura-3.8.4/po/it.po sakura-3.8.5/po/it.po --- sakura-3.8.4/po/it.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/it.po 2022-03-30 21:07:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: sakura-it \n" @@ -160,8 +160,17 @@ msgid "Select colors..." msgstr "Seleziona i colori..." -msgid "Always show tab bar" -msgstr "Mostra sempre la barra delle schede" +msgid "Show tab bar" +msgstr "Mostra la barra delle schede" + +msgid "Always" +msgstr "Sempre" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "Schede in basso" @@ -172,7 +181,7 @@ msgid "Show scrollbar" msgstr "Visualizza la barra di scorrimento" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "Meno domande al momento dell'uscita" msgid "Set urgent bell" @@ -187,9 +196,6 @@ msgid "Disable numbered tabswitch" msgstr "Disabilitare i numeri per cambiare scheda" -msgid "Enable focus fade" -msgstr "Abilitare il dimmer della messa a fuoco" - msgid "Set cursor type" msgstr "Imposta il modello di cursore" @@ -235,3 +241,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "La versione di sakura è %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Abilitare il dimmer della messa a fuoco" diff -Nru sakura-3.8.4/po/ja.po sakura-3.8.5/po/ja.po --- sakura-3.8.4/po/ja.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/ja.po 2022-03-30 21:07:59.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-08-12 16:55+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Japanese \n" @@ -156,8 +156,17 @@ msgid "Select colors..." msgstr "色を選択..." -msgid "Always show tab bar" -msgstr "タブバーを常に表示" +msgid "Show tab bar" +msgstr "タブバーを表示" + +msgid "Always" +msgstr "常に" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "タブを下に表示" @@ -168,7 +177,7 @@ msgid "Show scrollbar" msgstr "スクロールバーを表示" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "終了時の質問が少なくする" msgid "Set urgent bell" @@ -183,9 +192,6 @@ msgid "Disable numbered tabswitch" msgstr "番号のタブ切り替えを無効にする" -msgid "Enable focus fade" -msgstr "フォーカスフェードを有効にする" - msgid "Set cursor type" msgstr "カーソルタイプを設定" @@ -230,3 +236,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura のバージョンは %s です\n" + +#~ msgid "Enable focus fade" +#~ msgstr "フォーカスフェードを有効にする" diff -Nru sakura-3.8.4/po/ko.po sakura-3.8.5/po/ko.po --- sakura-3.8.4/po/ko.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/ko.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-09-30 05:48+0000\n" "Last-Translator: Minho Park \n" "Language-Team: Korean \n" @@ -159,8 +159,17 @@ msgid "Select colors..." msgstr "색상 선택..." -msgid "Always show tab bar" -msgstr "탭바 항상 보기" +msgid "Show tab bar" +msgstr "탭바 보기" + +msgid "Always" +msgstr "항상" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "탭을 아래에 표시" @@ -171,7 +180,7 @@ msgid "Show scrollbar" msgstr "스크롤바 보기" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "종료 시 적은 질문" msgid "Set urgent bell" @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "번호 탭 스위치 사용 안 함" -msgid "Enable focus fade" -msgstr "초점 페이드 사용" - msgid "Set cursor type" msgstr "커서 종류 설정" @@ -233,3 +239,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura 버전은 %s 입니다\n" + +#~ msgid "Enable focus fade" +#~ msgstr "초점 페이드 사용" diff -Nru sakura-3.8.4/po/pl.po sakura-3.8.5/po/pl.po --- sakura-3.8.4/po/pl.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/pl.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 14:36-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Polish \n" @@ -162,8 +162,17 @@ msgid "Select colors..." msgstr "Wybierz kolory..." -msgid "Always show tab bar" -msgstr "Zawsze wyświetlaj pasek kart" +msgid "Show tab bar" +msgstr "Wyświetlaj pasek kart" + +msgid "Always" +msgstr "Zawsze" + +msgid "When there's more than one tab" +msgstr "Kiedy jest więcej niż jeden" + +msgid "Never" +msgstr "Nigdy" msgid "Tabs at bottom" msgstr "Karty na dole" @@ -174,7 +183,7 @@ msgid "Show scrollbar" msgstr "Pokaż pasek przesuwania" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" #, fuzzy @@ -190,9 +199,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "" - msgid "Set cursor type" msgstr "Wybierz typ kursora" diff -Nru sakura-3.8.4/po/pt_BR.po sakura-3.8.5/po/pt_BR.po --- sakura-3.8.4/po/pt_BR.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/pt_BR.po 2022-03-30 21:07:59.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: fabio.antunes@hotmail.com \n" @@ -158,8 +158,17 @@ msgid "Select colors..." msgstr "Selecionar cores..." -msgid "Always show tab bar" -msgstr "Sempre mostrar a barra de abas" +msgid "Show tab bar" +msgstr "Mostrar a barra de abas" + +msgid "Always" +msgstr "Sempre" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "Nunca" msgid "Tabs at bottom" msgstr "Abas em baixo" @@ -170,7 +179,7 @@ msgid "Show scrollbar" msgstr "Mostra barra de rolagem" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" #, fuzzy @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "" - msgid "Set cursor type" msgstr "Definir tipo de cursor" diff -Nru sakura-3.8.4/po/pt.po sakura-3.8.5/po/pt.po --- sakura-3.8.4/po/pt.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/pt.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Portuguese \n" @@ -159,8 +159,17 @@ msgid "Select colors..." msgstr "Escolha as cores..." -msgid "Always show tab bar" -msgstr "Barra de separadores omnipresente" +msgid "Show tab bar" +msgstr "Mostrar barra de separadores" + +msgid "Always" +msgstr "Sempre" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "Nunca" msgid "Tabs at bottom" msgstr "Separadores em baixo" @@ -171,7 +180,7 @@ msgid "Show scrollbar" msgstr "Mostrar barra de deslocação" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" msgid "Set urgent bell" @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "Habilitar enfranquecimiento do foco" - msgid "Set cursor type" msgstr "Definir tipo de cursor" @@ -233,3 +239,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "A versão do sakura é a %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Habilitar enfranquecimiento do foco" diff -Nru sakura-3.8.4/po/ru.po sakura-3.8.5/po/ru.po --- sakura-3.8.4/po/ru.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/ru.po 2022-03-30 21:07:59.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: ManDrive \n" "Language-Team: Evgenij Vdovin \n" @@ -110,7 +110,7 @@ msgstr "Палитра" msgid "Use bright colors for bold text" -msgstr "" +msgstr "Изображать толстый шрифт яркими цветами" msgid "Set window title" msgstr "Изменение заголовка окна" @@ -154,8 +154,17 @@ msgid "Select colors..." msgstr "Выбрать цвета..." -msgid "Always show tab bar" -msgstr "Всегда показывать панель вкладок" +msgid "Show tab bar" +msgstr "Показывать панель вкладок" + +msgid "Always" +msgstr "Всегда" + +msgid "When there's more than one tab" +msgstr "Если имеется более чем одна" + +msgid "Never" +msgstr "Никогда" msgid "Tabs at bottom" msgstr "Панель вкладок внизу" @@ -166,8 +175,8 @@ msgid "Show scrollbar" msgstr "Показать линейку прокрутки" -msgid "Less questions at exit time" -msgstr "" +msgid "Fewer questions at exit time" +msgstr "Меньше вопросов при выходе" msgid "Set urgent bell" msgstr "Установить срочный звонок" @@ -181,9 +190,6 @@ msgid "Disable numbered tabswitch" msgstr "Отключить нумерованный переключатель вкладок" -msgid "Enable focus fade" -msgstr "Включение фокусировки замирания" - msgid "Set cursor type" msgstr "Установить вид курсора" @@ -228,3 +234,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "Версия sakura %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Включение фокусировки замирания" diff -Nru sakura-3.8.4/po/sv.po sakura-3.8.5/po/sv.po --- sakura-3.8.4/po/sv.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/sv.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-08-12 16:27+0000\n" "Last-Translator: Andreas Rönnquist \n" "Language-Team: Swedish \n" @@ -159,8 +159,17 @@ msgid "Select colors..." msgstr "Välj färger..." -msgid "Always show tab bar" -msgstr "Visa alltid flikfältet" +msgid "Show tab bar" +msgstr "Visa flikfältet" + +msgid "Always" +msgstr "Alltid" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "Aldrig" msgid "Tabs at bottom" msgstr "Flikar nederst" @@ -171,7 +180,7 @@ msgid "Show scrollbar" msgstr "Visa rullningslist" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" msgid "Set urgent bell" @@ -186,9 +195,6 @@ msgid "Disable numbered tabswitch" msgstr "Inaktivera numrerad flikväxlare" -msgid "Enable focus fade" -msgstr "Aktivera fokustoning" - msgid "Set cursor type" msgstr "Sätt markörtyp" @@ -233,3 +239,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura-versionen är %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "Aktivera fokustoning" diff -Nru sakura-3.8.4/po/uk.po sakura-3.8.5/po/uk.po --- sakura-3.8.4/po/uk.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/uk.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2018-04-29 13:18+0000\n" "Last-Translator: Andriy Nezhivy \n" "Language-Team: Ukrainian \n" @@ -137,11 +137,9 @@ msgid "Open mail" msgstr "Відкрити посилання..." -#, fuzzy msgid "Open link" msgstr "Відкрити посилання..." -#, fuzzy msgid "Copy link" msgstr "Копіювати посилання..." @@ -172,8 +170,17 @@ msgid "Select colors..." msgstr "Обрати кольори..." -msgid "Always show tab bar" -msgstr "Завжди показувати панель вкладок" +msgid "Show tab bar" +msgstr "Показувати панель вкладок" + +msgid "Always" +msgstr "Завжди" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "Ніколи" msgid "Tabs at bottom" msgstr "Вкладки знизу" @@ -184,7 +191,7 @@ msgid "Show scrollbar" msgstr "Показувати скроллбар" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "" #, fuzzy @@ -200,9 +207,6 @@ msgid "Disable numbered tabswitch" msgstr "" -msgid "Enable focus fade" -msgstr "" - msgid "Set cursor type" msgstr "Оберіть тип курсора" diff -Nru sakura-3.8.4/po/zh_CN.po sakura-3.8.5/po/zh_CN.po --- sakura-3.8.4/po/zh_CN.po 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/po/zh_CN.po 2022-03-30 21:07:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 1.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-23 07:17+0200\n" +"POT-Creation-Date: 2021-12-18 10:39-0500\n" "PO-Revision-Date: 2019-08-12 17:06+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Chinese/Simplified \n" @@ -159,8 +159,18 @@ msgid "Select colors..." msgstr "选择颜色..." -msgid "Always show tab bar" -msgstr "总是显示第一个标签页" +# msgstr "总是显示第一个标签页" +msgid "Show tab bar" +msgstr "" + +msgid "Always" +msgstr "" + +msgid "When there's more than one tab" +msgstr "" + +msgid "Never" +msgstr "" msgid "Tabs at bottom" msgstr "标签页在底部" @@ -171,7 +181,7 @@ msgid "Show scrollbar" msgstr "显示滚动条" -msgid "Less questions at exit time" +msgid "Fewer questions at exit time" msgstr "退出时的问题较少" msgid "Set urgent bell" @@ -186,9 +196,6 @@ msgid "Disable numbered tabswitch" msgstr "禁用编号标签开关" -msgid "Enable focus fade" -msgstr "启动焦点淡化" - msgid "Set cursor type" msgstr "设置光标类型" @@ -233,3 +240,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura 版本是 %s\n" + +#~ msgid "Enable focus fade" +#~ msgstr "启动焦点淡化" diff -Nru sakura-3.8.4/sakura.pod sakura-3.8.5/sakura.pod --- sakura-3.8.4/sakura.pod 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/sakura.pod 2022-03-30 21:07:59.000000000 +0000 @@ -123,6 +123,16 @@ =back +=head1 CONFIGURATION + +=over 8 + +=item show_tab_bar=[always | multiple | never] + +This list of options is currently incomplete. + +=back + =head1 KEYBINDINGS SUPPORT B supports keyboard bindings. They are configurable by setting the following properties in your sakura config file (~/.config/sakura/sakura.conf). diff -Nru sakura-3.8.4/src/sakura.c sakura-3.8.5/src/sakura.c --- sakura-3.8.4/src/sakura.c 2021-10-15 00:55:05.000000000 +0000 +++ sakura-3.8.5/src/sakura.c 2022-03-30 21:07:59.000000000 +0000 @@ -231,6 +231,14 @@ +/* Tab bar visibility */ +typedef enum { + SHOW_TAB_BAR_ALWAYS, + SHOW_TAB_BAR_MULTIPLE, + SHOW_TAB_BAR_NEVER +} ShowTabBar; + + /* Global sakura data */ static struct { GtkWidget *main_window; @@ -252,7 +260,7 @@ glong rows; gint scroll_lines; VteCursorShape cursor_type; - bool first_tab; + ShowTabBar show_tab_bar; /* Show the tab bar: always, multiple, never */ bool show_scrollbar; bool show_closebutton; bool tabs_on_bottom; @@ -442,7 +450,7 @@ static void sakura_copy_url_cb (GtkWidget *, void *); static void sakura_copy_cb (GtkWidget *, void *); static void sakura_paste_cb (GtkWidget *, void *); -static void sakura_show_first_tab_cb (GtkWidget *, void *); +static void sakura_show_tab_bar_cb (GtkWidget *, void *); static void sakura_tabs_on_bottom_cb (GtkWidget *, void *); static void sakura_less_questions_cb (GtkWidget *, void *); static void sakura_show_close_button_cb (GtkWidget *, void *); @@ -525,9 +533,6 @@ }; - - - /*************************/ /* Main window callbacks */ /*************************/ @@ -560,8 +565,8 @@ /* Switch tab keybinding pressed (numbers or next/prev) */ /* In cases when the user configured accelerators like these ones: - switch_tab_accelerator=4 for ctrl+next[prev]_tab_key - move_tab_accelerator=5 for ctrl+shift+next[prev]_tab_key + switch_tab_accelerator=4 for ctrl+next[prev]_tab_key + move_tab_accelerator=5 for ctrl+shift+next[prev]_tab_key move never works, because switch will be processed first, so it needs to be fixed with the following condition */ if ( ((event->state & sakura.switch_tab_accelerator) == sakura.switch_tab_accelerator) && ((event->state & sakura.move_tab_accelerator) != sakura.move_tab_accelerator) ) { @@ -891,9 +896,6 @@ if (button_event->type != GDK_BUTTON_RELEASE) return FALSE; - if (button_event->button == 1) - sakura_copy(); - return FALSE; } @@ -923,14 +925,6 @@ return TRUE; } - /* Paste when paste button is pressed */ - if (button_event->button == sakura.paste_button) { - sakura_paste(); - - /* Do not propagate. vte has his own copy-on-select and we'll end with duplicates pastes */ - return TRUE; - } - /* Show the popup menu when menu button is pressed */ if (button_event->button == sakura.menu_button) { GtkMenu *menu; @@ -1228,12 +1222,12 @@ GtkColorButton *fore_button = g_object_get_data (G_OBJECT(dialog), "fore_button"); GtkColorButton *back_button = g_object_get_data (G_OBJECT(dialog), "back_button"); GtkColorButton *curs_button = g_object_get_data (G_OBJECT(dialog), "curs_button"); - GdkRGBA *forecolors = g_object_get_data( G_OBJECT(dialog), "fore"); - GdkRGBA *backcolors = g_object_get_data( G_OBJECT(dialog), "back"); - GdkRGBA *curscolors = g_object_get_data( G_OBJECT(dialog), "curs"); + GdkRGBA *forecolors = g_object_get_data (G_OBJECT(dialog), "fore"); + GdkRGBA *backcolors = g_object_get_data (G_OBJECT(dialog), "back"); + GdkRGBA *curscolors = g_object_get_data (G_OBJECT(dialog), "curs"); GtkComboBox *cs_combo = g_object_get_data (G_OBJECT(dialog), "cs_combo"); GtkComboBox *scheme_combo = g_object_get_data (G_OBJECT(dialog), "scheme_combo"); - GtkSpinButton *opacity_spin = g_object_get_data(G_OBJECT(dialog), "opacity_spin"); + GtkSpinButton *opacity_spin = g_object_get_data (G_OBJECT(dialog), "opacity_spin"); GtkCheckButton *bib_checkbutton = g_object_get_data (G_OBJECT(dialog), "bib_checkbutton"); gint current_cs = gtk_combo_box_get_active(cs_combo); @@ -1570,20 +1564,29 @@ static void -sakura_show_first_tab_cb (GtkWidget *widget, void *data) +sakura_show_tab_bar_cb (GtkWidget *widget, void *data) { - if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) { - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), TRUE); - sakura_set_config_string("show_always_first_tab", "Yes"); - sakura.first_tab = true; - } else { - /* Only hide tabs if the notebook has one page */ - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)) == 1) { - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), FALSE); - } - sakura_set_config_string("show_always_first_tab", "No"); - sakura.first_tab = false; + char *setting_string = (char *)data; + char *config_string; + gboolean show_tabs; + + if (strcmp(setting_string, "always")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_ALWAYS; + config_string = "always"; + show_tabs = TRUE; + } else if (strcmp(setting_string, "multiple")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_MULTIPLE; + config_string = "multiple"; + show_tabs = (gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)) != 1); + } else if (strcmp(setting_string, "never")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_NEVER; + config_string = "never"; + show_tabs = FALSE; } + + sakura_set_config_string("show_tab_bar", config_string); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), show_tabs); + sakura_set_size(); } @@ -1919,11 +1922,27 @@ sakura.font = pango_font_description_from_string(cfgtmp); free(cfgtmp); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "show_always_first_tab", NULL)) { - sakura_set_config_string("show_always_first_tab", "No"); + if (!g_key_file_has_key(sakura.cfg, cfg_group, "show_tab_bar", NULL)) { + /* legacy option "show_always_first_tab" now sets "show_tab_bar = always | multiple" */ + if (g_key_file_has_key(sakura.cfg, cfg_group, "show_always_first_tab", NULL)) { + cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "show_always_first_tab", NULL); + sakura_set_config_string("show_tab_bar", (strcmp(cfgtmp, "Yes")==0) ? "always" : "multiple"); + free(cfgtmp); + } else { + sakura_set_config_string("show_tab_bar", "multiple"); + } + } + cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "show_tab_bar", NULL); + if (strcmp(cfgtmp, "always")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_ALWAYS; + } else if (strcmp(cfgtmp, "multiple")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_MULTIPLE; + } else if (strcmp(cfgtmp, "never")==0) { + sakura.show_tab_bar = SHOW_TAB_BAR_NEVER; + } else { + fprintf(stderr, "Invalid configuration value: show_tab_bar=%s (valid values: always|multiple|never)\n", cfgtmp); + sakura.show_tab_bar = SHOW_TAB_BAR_MULTIPLE; } - cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "show_always_first_tab", NULL); - sakura.first_tab = (strcmp(cfgtmp, "Yes")==0) ? true : false; free(cfgtmp); if (!g_key_file_has_key(sakura.cfg, cfg_group, "scrollbar", NULL)) { @@ -2268,12 +2287,14 @@ { GtkWidget *item_new_tab, *item_set_name, *item_close_tab, *item_copy, *item_paste, *item_fullscreen, *item_select_font, *item_select_colors, + *item_show_tab_bar, + *item_show_tab_bar_always, *item_show_tab_bar_multiple, *item_show_tab_bar_never, *item_toggle_scrollbar, *item_options, - *item_show_first_tab, *item_urgent_bell, *item_audible_bell, *item_blinking_cursor, + *item_urgent_bell, *item_audible_bell, *item_blinking_cursor, *item_cursor, *item_cursor_block, *item_cursor_underline, *item_cursor_ibeam, *item_show_close_button, *item_tabs_on_bottom, *item_less_questions, *item_disable_numbered_tabswitch; // *item_use_fading; - GtkWidget *options_menu, *cursor_menu; + GtkWidget *options_menu, *show_tab_bar_menu, *cursor_menu; sakura.item_open_mail = gtk_menu_item_new_with_label(_("Open mail")); sakura.item_open_link = gtk_menu_item_new_with_label(_("Open link")); @@ -2289,11 +2310,16 @@ item_select_font = gtk_menu_item_new_with_label(_("Select font...")); item_select_colors = gtk_menu_item_new_with_label(_("Select colors...")); - item_show_first_tab = gtk_check_menu_item_new_with_label(_("Always show tab bar")); + item_show_tab_bar = gtk_menu_item_new_with_label(_("Show tab bar")); + item_show_tab_bar_always = gtk_radio_menu_item_new_with_label(NULL, _("Always")); + item_show_tab_bar_multiple = gtk_radio_menu_item_new_with_label_from_widget( + GTK_RADIO_MENU_ITEM(item_show_tab_bar_always), _("When there's more than one tab")); + item_show_tab_bar_never = gtk_radio_menu_item_new_with_label_from_widget( + GTK_RADIO_MENU_ITEM(item_show_tab_bar_always), _("Never")); item_tabs_on_bottom = gtk_check_menu_item_new_with_label(_("Tabs at bottom")); item_show_close_button = gtk_check_menu_item_new_with_label(_("Show close button on tabs")); item_toggle_scrollbar = gtk_check_menu_item_new_with_label(_("Show scrollbar")); - item_less_questions = gtk_check_menu_item_new_with_label(_("Less questions at exit time")); + item_less_questions = gtk_check_menu_item_new_with_label(_("Fewer questions at exit time")); item_urgent_bell = gtk_check_menu_item_new_with_label(_("Set urgent bell")); item_audible_bell = gtk_check_menu_item_new_with_label(_("Set audible bell")); item_blinking_cursor = gtk_check_menu_item_new_with_label(_("Set blinking cursor")); @@ -2305,10 +2331,15 @@ item_cursor_ibeam = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(item_cursor_block), _("IBeam")); /* Show defaults in menu items */ - if (sakura.first_tab) { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_show_first_tab), TRUE); - } else { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_show_first_tab), FALSE); + switch (sakura.show_tab_bar) { + case SHOW_TAB_BAR_ALWAYS: + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_show_tab_bar_always), TRUE); + break; + case SHOW_TAB_BAR_MULTIPLE: + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_show_tab_bar_multiple), TRUE); + break; + case SHOW_TAB_BAR_NEVER: + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_show_tab_bar_never), TRUE); } if (sakura.show_closebutton) { @@ -2391,12 +2422,16 @@ gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), item_options); options_menu = gtk_menu_new(); + show_tab_bar_menu = gtk_menu_new(); cursor_menu = gtk_menu_new(); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_select_colors); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_select_font); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), gtk_separator_menu_item_new()); - gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_show_first_tab); + gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_show_tab_bar); + gtk_menu_shell_append(GTK_MENU_SHELL(show_tab_bar_menu), item_show_tab_bar_always); + gtk_menu_shell_append(GTK_MENU_SHELL(show_tab_bar_menu), item_show_tab_bar_multiple); + gtk_menu_shell_append(GTK_MENU_SHELL(show_tab_bar_menu), item_show_tab_bar_never); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_tabs_on_bottom); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_show_close_button); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), gtk_separator_menu_item_new()); @@ -2413,6 +2448,7 @@ gtk_menu_shell_append(GTK_MENU_SHELL(cursor_menu), item_cursor_ibeam); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item_options), options_menu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item_show_tab_bar), show_tab_bar_menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item_cursor), cursor_menu); /* ... and finally assign callbacks to menuitems */ @@ -2424,7 +2460,9 @@ g_signal_connect(G_OBJECT(item_paste), "activate", G_CALLBACK(sakura_paste_cb), NULL); g_signal_connect(G_OBJECT(item_select_colors), "activate", G_CALLBACK(sakura_color_dialog_cb), NULL); - g_signal_connect(G_OBJECT(item_show_first_tab), "activate", G_CALLBACK(sakura_show_first_tab_cb), NULL); + g_signal_connect(G_OBJECT(item_show_tab_bar_always), "activate", G_CALLBACK(sakura_show_tab_bar_cb), "always"); + g_signal_connect(G_OBJECT(item_show_tab_bar_multiple), "activate", G_CALLBACK(sakura_show_tab_bar_cb), "multiple"); + g_signal_connect(G_OBJECT(item_show_tab_bar_never), "activate", G_CALLBACK(sakura_show_tab_bar_cb), "never"); g_signal_connect(G_OBJECT(item_tabs_on_bottom), "activate", G_CALLBACK(sakura_tabs_on_bottom_cb), NULL); g_signal_connect(G_OBJECT(item_less_questions), "activate", G_CALLBACK(sakura_less_questions_cb), NULL); g_signal_connect(G_OBJECT(item_show_close_button), "activate", G_CALLBACK(sakura_show_close_button_cb), NULL); @@ -2444,7 +2482,6 @@ g_signal_connect(G_OBJECT(item_fullscreen), "activate", G_CALLBACK(sakura_fullscreen_cb), NULL); gtk_widget_show_all(sakura.menu); - } @@ -2463,7 +2500,6 @@ free(sakura.configfile); gtk_main_quit(); - } @@ -2633,7 +2669,7 @@ sakura.width = pad_x + (char_width * sakura.columns); sakura.height = pad_y + (char_height * sakura.rows); - if (npages>=2 || sakura.first_tab) { + if (sakura.show_tab_bar == SHOW_TAB_BAR_ALWAYS || (sakura.show_tab_bar == SHOW_TAB_BAR_MULTIPLE && npages > 1)) { /* TODO: Yeah i know, this is utter shit. Remove this ugly hack and set geometry hints*/ if (!sakura.show_scrollbar) @@ -2734,7 +2770,6 @@ /* Main window opacity must be set. Otherwise vte widget will remain opaque */ gtk_widget_set_opacity(sakura.main_window, sakura.backcolors[sk_tab->colorset].alpha); - } @@ -2833,7 +2868,7 @@ int index; int npages; gchar *cwd = NULL; gchar *default_label_text = NULL; - sk_tab = g_new0( struct sakura_tab, 1 ); + sk_tab = g_new0(struct sakura_tab, 1); /* Create the tab label */ sk_tab->label = gtk_label_new(NULL); @@ -2925,7 +2960,7 @@ /* First tab */ npages=gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)); if (npages == 1) { - if (sakura.first_tab) { + if (sakura.show_tab_bar == SHOW_TAB_BAR_ALWAYS) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), TRUE); } else { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), FALSE); @@ -3022,7 +3057,7 @@ gtk_widget_hide(sk_tab->scrollbar); } - if (npages == 2) { + if (npages == 2 && sakura.show_tab_bar != SHOW_TAB_BAR_NEVER) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), TRUE); sakura_set_size(); } @@ -3113,7 +3148,7 @@ /* Do the first tab checks BEFORE deleting the tab, to ensure correct * sizes are calculated when the tab is deleted */ if (npages == 2) { - if (sakura.first_tab) { + if (sakura.show_tab_bar == SHOW_TAB_BAR_ALWAYS) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), TRUE); } else { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(sakura.notebook), FALSE);