[Xfce4-commits] [xfce/xfce4-settings] branch master updated (4d9e325 - 515dd53)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from 4d9e325 I18n: Update translation zh_TW (100%). new 515dd53 I18n: Update translation fr (100%). The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/fr.po | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] 02/03: I18n: Update translation es (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-power-manager. commit 68e9945d789e967df10d743a58d73ef1c9ee973b Author: Pablo Roberto Francisco Lezaeta Reyes prfl...@gmail.com Date: Fri Jul 11 12:30:38 2014 +0200 I18n: Update translation es (100%). 214 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/es.po | 100 -- 1 file changed, 58 insertions(+), 42 deletions(-) diff --git a/po/es.po b/po/es.po index af8d9a9..e0ecfff 100644 --- a/po/es.po +++ b/po/es.po @@ -11,9 +11,9 @@ msgid msgstr Project-Id-Version: Xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-08 00:30+0200\n -PO-Revision-Date: 2014-07-08 11:12+\n -Last-Translator: gabrieltandil gabriel.tan...@gmail.com\n +POT-Creation-Date: 2014-07-11 00:30+0200\n +PO-Revision-Date: 2014-07-11 04:47+\n +Last-Translator: Pablo Roberto Francisco Lezaeta Reyes prfl...@gmail.com\n Language-Team: Spanish (http://www.transifex.com/projects/p/xfce4-power-manager/language/es/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -140,22 +140,38 @@ msgid bPower saving/b msgstr bAhoro de energía/b #: ../data/interfaces/xfpm-settings.ui.h:30 -msgid On inactivity reduce to -msgstr En actividad reducir a +msgid Display +msgstr Pantalla #: ../data/interfaces/xfpm-settings.ui.h:31 -msgid Reduce after -msgstr Reducir después +msgid _Handle display brightness +msgstr _Manejar la gestión de brillo #: ../data/interfaces/xfpm-settings.ui.h:32 -msgid bBrightness/b -msgstr bBrillo/b +msgid _Register display brightness shortcut keys +msgstr _Registrar los atajos de teclado para la gestión de brillo #: ../data/interfaces/xfpm-settings.ui.h:33 -msgid Display -msgstr Pantalla +msgid Change per s_tep: +msgstr Cambio por p_aso: #: ../data/interfaces/xfpm-settings.ui.h:34 +msgid bKeys/b +msgstr bTeclas/b + +#: ../data/interfaces/xfpm-settings.ui.h:35 +msgid On inactivity reduce to +msgstr En actividad reducir a + +#: ../data/interfaces/xfpm-settings.ui.h:36 +msgid Reduce after +msgstr Reducir después + +#: ../data/interfaces/xfpm-settings.ui.h:37 +msgid _Brightness +msgstr _Brillo + +#: ../data/interfaces/xfpm-settings.ui.h:38 msgid Nothing msgstr Nada @@ -519,73 +535,73 @@ msgstr[1] minutos #: ../common/xfpm-power-common.c:369 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%, %s runtime)\t -msgstr b%s %s/b\nCarga completa (%0.0f %%, %s en ejecución) +b%s %s/b\n +Fully charged (%0.0f%%, %s runtime) +msgstr b%s %s/b\nCompletamente cargada (%0.0f %%, %s tiempo de ejecución) #: ../common/xfpm-power-common.c:377 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%)\t -msgstr b%s %s/b\nCarga completa (%0.0f %%) +b%s %s/b\n +Fully charged (%0.0f%%) +msgstr b%s %s/b\nCompletamente cargada (%0.0f %%) #: ../common/xfpm-power-common.c:387 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%, %s)\t +b%s %s/b\n +Charging (%0.0f%%, %s) msgstr b%s %s/b\nCargando (%0.0f %%, %s) #: ../common/xfpm-power-common.c:395 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%)\t +b%s %s/b\n +Charging (%0.0f%%) msgstr b%s %s/b\nCargando (%0.0f %%) #: ../common/xfpm-power-common.c:405 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%, %s)\t +b%s %s/b\n +Discharging (%0.0f%%, %s) msgstr b%s %s/b\nDescargando (%0.0f %%, %s) #: ../common/xfpm-power-common.c:413 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%)\t +b%s %s/b\n +Discharging (%0.0f%%) msgstr b%s %s/b\nDescargando (%0.0f %%) #: ../common/xfpm-power-common.c:420 #, c-format msgid -b%s %s/b\t\n -Waiting to discharge (%0.0f%%)\t -msgstr b%s %s/b\nEsperando a descargarse (%0.0f %%) +b%s %s/b\n +Waiting to discharge (%0.0f%%) +msgstr b%s %s/b\nEsperando a descargar (%0.0f %%) #: ../common/xfpm-power-common.c:426 #, c-format msgid -b%s %s/b\t\n -Waiting to charge (%0.0f%%)\t -msgstr b%s %s/b\nEsperando a descargarse (%0.0f %%) +b%s %s/b\n +Waiting to charge (%0.0f%%) +msgstr b%s %s/b\nEsperando a cargar (%0.0f %%) #: ../common/xfpm-power-common.c:432 #, c-format msgid -b%s %s/b\t\n -is empty\t -msgstr b%s %s/b\nVacía +b%s %s/b\n +is empty +msgstr b%s %s/b\nEstá vacía #. On the 2nd line we want to know if the power cord is plugged #. * in or not #: ../common/xfpm-power-common.c:441 #, c-format msgid -b%s %s/b\t\n -%s\t +b%s %s/b\n +%s msgstr b%s %s/b\n%s #: ../common/xfpm-power-common.c:442 @@ -596,15 +612,15 @@ msgstr Sin conectar #. * which will probably just be Computer #: ../common/xfpm-power-common.c:448 #, c-format -msgid b%s %s/b\t -msgstr b%s %s/b\t +msgid b%s %s/b +msgstr b%s %s/b #. unknown device state, just display the percentage #: ../common/xfpm-power-common.c:453 #, c-format msgid -b%s %s/b\t\n -Unknown state\t +b%s %s/b\n +Unknown state msgstr b%s %s/b\nEstado desconocido
[Xfce4-commits] [xfce/xfce4-settings] 01/01: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 515dd5388654bea79fd51ff80f179eda70b6fb97 Author: Yannick Le Guen leguen.yann...@gmail.com Date: Fri Jul 11 12:30:45 2014 +0200 I18n: Update translation fr (100%). 352 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/fr.po b/po/fr.po index cf62790..edc7122 100644 --- a/po/fr.po +++ b/po/fr.po @@ -15,7 +15,7 @@ msgstr Project-Id-Version: Xfce4-settings\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2014-07-10 06:30+0200\n -PO-Revision-Date: 2014-07-10 19:13+\n +PO-Revision-Date: 2014-07-11 09:25+\n Last-Translator: Yannick Le Guen leguen.yann...@gmail.com\n Language-Team: French (http://www.transifex.com/projects/p/xfce4-settings/language/fr/)\n MIME-Version: 1.0\n @@ -412,7 +412,7 @@ msgstr Sons des évènements #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33 msgid Setti_ngs -msgstr Paramètres +msgstr Para_mètres #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 #: ../dialogs/appearance-settings/main.c:892 @@ -453,7 +453,7 @@ msgstr Texte à côté des icônes msgid Warning: this icon theme has no cache file. You can create this by running igtk-update-icon-cache %s/%s//i in a terminal emulator. -msgstr Attention : ce thème d'icônes a pas de fichier cache. Vous pouvez le créer en exécutant igtk-update-icon-cache %s/%s//i dans un émulateur de terminal. +msgstr Attention : ce thème d'icônes n'a aucun fichier cache. Vous pouvez le créer en exécutant igtk-update-icon-cache %s/%s//i dans un émulateur de terminal. #: ../dialogs/appearance-settings/main.c:765 #, c-format @@ -615,7 +615,7 @@ msgstr Horizontale et verticale #: ../dialogs/display-settings/main.c:122 msgid Minimal interface to set up an external output -msgstr Interface minimale pour configurer la sortie externe +msgstr Interface minimale pour configurer une sortie externe #: ../dialogs/display-settings/main.c:247 #, c-format @@ -632,16 +632,16 @@ msgstr %.1f Hz #: ../dialogs/display-settings/main.c:818 msgid Display: -msgstr Moniteur : +msgstr Écran : #: ../dialogs/display-settings/main.c:823 msgid Resolution: -msgstr _Résolution : +msgstr Résolution : #: ../dialogs/display-settings/main.c:1003 msgid The last active output must not be disabled, the system would be unusable. -msgstr La dernière sortie active ne doit pas être désactivée, le système pourrait devenir instable. +msgstr La dernière sortie active ne doit pas être désactivée, le système deviendrait inutilisable. #: ../dialogs/display-settings/main.c:1005 msgid Selected output not disabled @@ -729,7 +729,7 @@ msgstr Raccourci de commande #: ../dialogs/keyboard-settings/command-dialog.c:147 msgid Enter the command you want to trigger with a shortcut. -msgstr Entrez la commande que vous voulez déclencher avec un raccourci. +msgstr Entrer la commande que vous voulez déclencher avec un raccourci. #. We are editing an existing shortcut #: ../dialogs/keyboard-settings/command-dialog.c:165 @@ -742,7 +742,7 @@ msgstr Commande : #: ../dialogs/keyboard-settings/command-dialog.c:196 msgid Use _startup notification -msgstr Utiliser la notification de démarrage +msgstr Utiliser la notification de _démarrage #: ../dialogs/keyboard-settings/command-dialog.c:243 msgid The command may not be empty. @@ -750,7 +750,7 @@ msgstr La commande ne doit pas être vide. #: ../dialogs/keyboard-settings/command-dialog.c:263 msgid Select command -msgstr Choisissez une commande +msgstr Choisir une commande #: ../dialogs/keyboard-settings/command-dialog.c:271 #: ../dialogs/mime-settings/xfce-mime-chooser.c:386 @@ -788,7 +788,7 @@ msgstr Sélection de la disposition du clavier #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2 msgid Select keyboard layout and variant -msgstr Sélectionner la disposition et variante du clavier +msgstr Sélectionner la disposition et la variante du clavier #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:3 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1 @@ -798,7 +798,7 @@ msgstr Clavier #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2 msgid Edit keyboard settings and application shortcuts -msgstr Éditer les paramètres du clavier et raccourcis des applications +msgstr Éditer les paramètres du clavier et les raccourcis des applications #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 msgid Restore num l_ock state on startup @@ -833,7 +833,7 @@ msgstr Vitesse de _répétition : #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid The rate at which keystrokes are generated while a key is pressed -msgstr La vitesse à
[Xfce4-commits] [xfce/xfce4-power-manager] branch master updated (c4dc7b6 - 15890dc)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-power-manager. from c4dc7b6 Remove tab from translatable string new 2c314d6 I18n: Update translation bg (100%). new 68e9945 I18n: Update translation es (100%). new 15890dc I18n: Update translation fr (100%). The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/bg.po | 88 + po/es.po | 100 po/fr.po | 110 +++--- 3 files changed, 173 insertions(+), 125 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] 01/03: I18n: Update translation bg (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-power-manager. commit 2c314d6d1557df956f54e6957044bea3ba0b79a2 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Fri Jul 11 12:30:38 2014 +0200 I18n: Update translation bg (100%). 214 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/bg.po | 88 +- 1 file changed, 52 insertions(+), 36 deletions(-) diff --git a/po/bg.po b/po/bg.po index 2c24f0e..4d5259f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13,8 +13,8 @@ msgid msgstr Project-Id-Version: Xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-08 00:30+0200\n -PO-Revision-Date: 2014-07-08 06:47+\n +POT-Creation-Date: 2014-07-11 00:30+0200\n +PO-Revision-Date: 2014-07-11 06:31+\n Last-Translator: Kiril Kirilov cybercop_mont...@abv.bg\n Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce4-power-manager/language/bg/)\n MIME-Version: 1.0\n @@ -142,22 +142,38 @@ msgid bPower saving/b msgstr bСъхранение на енергията/b #: ../data/interfaces/xfpm-settings.ui.h:30 -msgid On inactivity reduce to -msgstr При неактивност, ограничаване до +msgid Display +msgstr Дисплей #: ../data/interfaces/xfpm-settings.ui.h:31 -msgid Reduce after -msgstr Ограничаване след +msgid _Handle display brightness +msgstr Управление на яркостта на дисплея #: ../data/interfaces/xfpm-settings.ui.h:32 -msgid bBrightness/b -msgstr bЯркост/b +msgid _Register display brightness shortcut keys +msgstr Регистър на яркостта на дисплея клавишни комбинации #: ../data/interfaces/xfpm-settings.ui.h:33 -msgid Display -msgstr Дисплей +msgid Change per s_tep: +msgstr Стъпка на промяна: #: ../data/interfaces/xfpm-settings.ui.h:34 +msgid bKeys/b +msgstr bКлавиши/b + +#: ../data/interfaces/xfpm-settings.ui.h:35 +msgid On inactivity reduce to +msgstr При неактивност, ограничаване до + +#: ../data/interfaces/xfpm-settings.ui.h:36 +msgid Reduce after +msgstr Ограничаване след + +#: ../data/interfaces/xfpm-settings.ui.h:37 +msgid _Brightness +msgstr Яркост + +#: ../data/interfaces/xfpm-settings.ui.h:38 msgid Nothing msgstr Нищо @@ -521,64 +537,64 @@ msgstr[1] минути #: ../common/xfpm-power-common.c:369 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%, %s runtime)\t +b%s %s/b\n +Fully charged (%0.0f%%, %s runtime) msgstr b%s %s/b\nНапълно заредена (%0.0f%%, %s време за работа) #: ../common/xfpm-power-common.c:377 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%)\t +b%s %s/b\n +Fully charged (%0.0f%%) msgstr b%s %s/b\nНапълно заредена (%0.0f%%) #: ../common/xfpm-power-common.c:387 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%, %s)\t +b%s %s/b\n +Charging (%0.0f%%, %s) msgstr b%s %s/b\nЗареждане (%0.0f%%, %s) #: ../common/xfpm-power-common.c:395 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%)\t +b%s %s/b\n +Charging (%0.0f%%) msgstr b%s %s/b\nЗареждане (%0.0f%%) #: ../common/xfpm-power-common.c:405 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%, %s)\t +b%s %s/b\n +Discharging (%0.0f%%, %s) msgstr b%s %s/b\nРазреждане (%0.0f%%, %s) #: ../common/xfpm-power-common.c:413 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%)\t +b%s %s/b\n +Discharging (%0.0f%%) msgstr b%s %s/b\nРазреждане (%0.0f%%) #: ../common/xfpm-power-common.c:420 #, c-format msgid -b%s %s/b\t\n -Waiting to discharge (%0.0f%%)\t +b%s %s/b\n +Waiting to discharge (%0.0f%%) msgstr b%s %s/b\nВреме до разреждане (%0.0f%%) #: ../common/xfpm-power-common.c:426 #, c-format msgid -b%s %s/b\t\n -Waiting to charge (%0.0f%%)\t +b%s %s/b\n +Waiting to charge (%0.0f%%) msgstr b%s %s/b\nВреме до зареждане (%0.0f%%) #: ../common/xfpm-power-common.c:432 #, c-format msgid -b%s %s/b\t\n -is empty\t +b%s %s/b\n +is empty msgstr b%s %s/b\nе празна #. On the 2nd line we want to know if the power cord is plugged @@ -586,9 +602,9 @@ msgstr b%s %s/b\nе празна #: ../common/xfpm-power-common.c:441 #, c-format msgid -b%s %s/b\t\n -%s\t -msgstr b%s %s/b \n%s +b%s %s/b\n +%s +msgstr b%s %s/b\n%s #: ../common/xfpm-power-common.c:442 msgid Not plugged in @@ -598,15 +614,15 @@ msgstr Не е свързано #. * which will probably just be Computer #: ../common/xfpm-power-common.c:448 #, c-format -msgid b%s %s/b\t -msgstr b%s %s/b +msgid b%s %s/b +msgstr b%s %s/b #. unknown device state, just display the percentage #: ../common/xfpm-power-common.c:453 #, c-format msgid -b%s %s/b\t\n -Unknown state\t +b%s %s/b\n +Unknown state msgstr b%s %s/b\nНеизвестно състояние #: ../src/xfpm-power.c:334 @@ -670,7 +686,7 @@ msgstr Нивото на батерията %s е ниско\nОставащо #: ../src/xfpm-power.c:1438 msgid -The requested operation requires elevated privileges.\t\n +The requested operation requires elevated privileges.\n Please enter your password. msgstr
[Xfce4-commits] [xfce/xfce4-power-manager] 03/03: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-power-manager. commit 15890dcc4830d710956e9bac52ada014ea0be2d2 Author: Yannick Le Guen leguen.yann...@gmail.com Date: Fri Jul 11 12:30:38 2014 +0200 I18n: Update translation fr (100%). 214 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 110 +++--- 1 file changed, 63 insertions(+), 47 deletions(-) diff --git a/po/fr.po b/po/fr.po index 363d263..5a9ffa8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,9 +12,9 @@ msgid msgstr Project-Id-Version: Xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-08 00:30+0200\n -PO-Revision-Date: 2014-07-08 18:33+\n -Last-Translator: Urien Desterres urien.dester...@gmail.com\n +POT-Creation-Date: 2014-07-11 00:30+0200\n +PO-Revision-Date: 2014-07-11 08:24+\n +Last-Translator: Yannick Le Guen leguen.yann...@gmail.com\n Language-Team: French (http://www.transifex.com/projects/p/xfce4-power-manager/language/fr/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -141,22 +141,38 @@ msgid bPower saving/b msgstr bÉconomie d'énergie/b #: ../data/interfaces/xfpm-settings.ui.h:30 -msgid On inactivity reduce to -msgstr En cas d'inactivité réduire à +msgid Display +msgstr Écran #: ../data/interfaces/xfpm-settings.ui.h:31 -msgid Reduce after -msgstr Réduire après +msgid _Handle display brightness +msgstr _Gérer la luminosité de l'écran #: ../data/interfaces/xfpm-settings.ui.h:32 -msgid bBrightness/b -msgstr bLuminosité/b +msgid _Register display brightness shortcut keys +msgstr Défini_r les raccourcis clavier pour la luminosité de l'écran #: ../data/interfaces/xfpm-settings.ui.h:33 -msgid Display -msgstr Écran +msgid Change per s_tep: +msgstr Modifier par pa_s : #: ../data/interfaces/xfpm-settings.ui.h:34 +msgid bKeys/b +msgstr bRaccourcis/b + +#: ../data/interfaces/xfpm-settings.ui.h:35 +msgid On inactivity reduce to +msgstr En cas d'inactivité réduire à + +#: ../data/interfaces/xfpm-settings.ui.h:36 +msgid Reduce after +msgstr Réduire après + +#: ../data/interfaces/xfpm-settings.ui.h:37 +msgid _Brightness +msgstr _Luminosité + +#: ../data/interfaces/xfpm-settings.ui.h:38 msgid Nothing msgstr Rien @@ -520,74 +536,74 @@ msgstr[1] minutes #: ../common/xfpm-power-common.c:369 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%, %s runtime)\t -msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%, durée %s)\t +b%s %s/b\n +Fully charged (%0.0f%%, %s runtime) +msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%, durée %s) #: ../common/xfpm-power-common.c:377 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%)\t -msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%)\t +b%s %s/b\n +Fully charged (%0.0f%%) +msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%) #: ../common/xfpm-power-common.c:387 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%, %s)\t -msgstr b%s %s/b\t\nEn charge (%0.0f%%, %s)\t +b%s %s/b\n +Charging (%0.0f%%, %s) +msgstr b%s %s/b\t\nEn charge (%0.0f%%, %s) #: ../common/xfpm-power-common.c:395 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%)\t -msgstr b%s %s/b\t\nEn charge (%0.0f%%)\t +b%s %s/b\n +Charging (%0.0f%%) +msgstr b%s %s/b\t\nEn charge (%0.0f%%) #: ../common/xfpm-power-common.c:405 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%, %s)\t -msgstr b%s %s/b\t\nEn décharge (%0.0f%%, %s)\t +b%s %s/b\n +Discharging (%0.0f%%, %s) +msgstr b%s %s/b\t\nEn décharge (%0.0f%%, %s) #: ../common/xfpm-power-common.c:413 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%)\t -msgstr b%s %s/b\t\nEn décharge (%0.0f%%)\t +b%s %s/b\n +Discharging (%0.0f%%) +msgstr b%s %s/b\t\nEn décharge (%0.0f%%) #: ../common/xfpm-power-common.c:420 #, c-format msgid -b%s %s/b\t\n -Waiting to discharge (%0.0f%%)\t -msgstr b%s %s/b\t\nEn attente de décharge (%0.0f%%)\t +b%s %s/b\n +Waiting to discharge (%0.0f%%) +msgstr b%s %s/b\t\nEn attente de décharge (%0.0f%%) #: ../common/xfpm-power-common.c:426 #, c-format msgid -b%s %s/b\t\n -Waiting to charge (%0.0f%%)\t -msgstr b%s %s/b\t\nEn attente de charge (%0.0f%%)\t +b%s %s/b\n +Waiting to charge (%0.0f%%) +msgstr b%s %s/b\t\nEn attente de charge (%0.0f%%) #: ../common/xfpm-power-common.c:432 #, c-format msgid -b%s %s/b\t\n -is empty\t -msgstr b%s %s/b\t\nest vide\t +b%s %s/b\n +is empty +msgstr b%s %s/b\t\nest vide #. On the 2nd line we want to know if the power cord is plugged #. * in or not #: ../common/xfpm-power-common.c:441 #, c-format msgid -b%s %s/b\t\n -%s\t -msgstr b%s %s/b\t\n%s\t +b%s %s/b\n +%s +msgstr b%s %s/b\n%s #: ../common/xfpm-power-common.c:442 msgid Not plugged in @@ -597,15 +613,15 @@ msgstr Non branché #. * which will probably just be Computer #: ../common/xfpm-power-common.c:448 #, c-format -msgid b%s %s/b\t -msgstr b%s %s/b\t
[Xfce4-commits] [apps/mousepad] branch master updated (5e95b16 - 3b084a5)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 5e95b16 I18n: Update translation nb (100%). new 203536a Build system support for GSettings new 78da59c Add GSettings subclass singleton and related hooks new 0393b73 Replace MousepadPreferences with GSettings new 97c0b8b Use DConf (or whatever the default) when DBus support is enabled new 1130299 Bind GSettings for view-line-numbers and window-statusbar-visible new 3606ff7 Use GSettings for the search bar search-match-case setting new 19182c7 Use GSettings for MousepadReplaceDialog search settings new f8a4bed Add GSettings wrapper functions to mousepad-settings.h new 011a2e8 Use existing config directory for GSettings keyfile backend new ad1c439 Make GSettings keyfile backend a separate compile-time option new d6ac79f Remove uneeded code for view-line-numbers setting new aa8a283 Remove uneeded code for view-auto-indent new 8b224a3 Refactor for view-font-name GSetting new 172ddea Make font-name a real property on MousepadView new f0391f0 Add view-show-whitespace and view-show-line-endings new fd87858 Use the rest of the GtkSourceView properties with GSettings new 81a430c Add color-scheme property to MousepadView new b48d3d7 Move word-wrap from MousepadDocument to MousepadView new f8d2d51 Make the misc- settings window- instead new 70761ea Always create a statusbar and just hide/show it new 4424326 Update the window title when path-in-title setting changes new cbc5fbe Keep the UI in sync with the always-show-tabs setting new e0ff5aa Keep the UI in sync with the recent-menu-items setting new 8df405f Move window-height and window-width in schema new d80b40b Re-write MousepadSettings to use multiple child schemas new c9b5563 Add helper function mousepad_settings_connect_changed() new 5ee27d2 Fix color-scheme property so setting saves correctly new 83d0ced Re-write the settings to make easier to use from code new 43e9873 Add preferences dialog new f95cb2f Fix one-time leak with keyfile settings backend new a334211 Change path parsing code to give caller 0-terminated string new 431baa2 Refactor GSettings path/schema code into separate class new 349b847 Re-organize the main menu a bit new 2b51559 Add a basic toolbar new 1c4dcd9 Remove mutex locking around global settings object new 4b7ffa3 Add use-default-monospace-font setting new a3a9517 Add fullscreen support new 68eaea8 Rename org.xfce.Mousepad.gschema.xml to use lower-case new 473af3d Change default of a couple settings new f94cf63 Disconnect font-name setting callback new 87f2d06 Implement match-braces setting new 3321a67 Improve toolbar preferences new b32b1b1 Bump GLib and GTK+ dependency versions new d23ccc4 Copy the main menu edit menu to the text view context menu new 3b084a5 Merge branch 'preferences-menu-toolbar' The 45 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |3 + Makefile.am|2 + README |3 +- autogen.sh |2 + configure.ac.in| 22 +- mousepad/Makefile.am | 33 +- mousepad/mousepad-application.c| 63 +- mousepad/mousepad-application.h|3 + mousepad/mousepad-document.c | 91 +-- mousepad/mousepad-document.h |6 - mousepad/mousepad-encoding-dialog.c|5 +- mousepad/mousepad-preferences.c| 652 mousepad/mousepad-preferences.h| 38 -- mousepad/mousepad-prefs-dialog.c | 569 + mousepad/mousepad-prefs-dialog.glade | 946 mousepad/mousepad-prefs-dialog.h | 24 + mousepad/mousepad-print.c |1 - mousepad/mousepad-private.h|1 + mousepad/mousepad-replace-dialog.c | 229 +++ mousepad/mousepad-search-bar.c | 47 +- mousepad/mousepad-settings-store.c | 279 + mousepad/mousepad-settings-store.h | 38 ++ mousepad/mousepad-settings.c | 288 + mousepad/mousepad-settings.h | 122 mousepad/mousepad-view.c | 526 ++-- mousepad/mousepad-view.h | 37 +- mousepad/mousepad-window-ui.xml
[Xfce4-commits] [apps/mousepad] 03/45: Replace MousepadPreferences with GSettings
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 0393b733eb4021b17912e38891e42aad1df447a4 Author: Matthew Brush mbr...@codebrainz.ca Date: Sun Jul 6 02:44:27 2014 -0700 Replace MousepadPreferences with GSettings --- mousepad/Makefile.am |2 - mousepad/mousepad-application.c|1 + mousepad/mousepad-document.c | 25 +- mousepad/mousepad-encoding-dialog.c|1 - mousepad/mousepad-preferences.c| 652 mousepad/mousepad-preferences.h| 38 -- mousepad/mousepad-print.c |1 - mousepad/mousepad-replace-dialog.c | 31 +- mousepad/mousepad-search-bar.c | 15 +- mousepad/mousepad-settings.c |2 +- mousepad/mousepad-window.c | 71 ++-- mousepad/org.xfce.Mousepad.gschema.xml |4 +- 12 files changed, 56 insertions(+), 787 deletions(-) diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am index 28c536e..b8bdf28 100644 --- a/mousepad/Makefile.am +++ b/mousepad/Makefile.am @@ -33,8 +33,6 @@ mousepad_SOURCES = \ mousepad-encoding-dialog.h \ mousepad-file.c \ mousepad-file.h \ - mousepad-preferences.c \ - mousepad-preferences.h \ mousepad-print.c \ mousepad-print.h \ mousepad-private.h \ diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c index 4ccfa74..24c9e64 100644 --- a/mousepad/mousepad-application.c +++ b/mousepad/mousepad-application.c @@ -19,6 +19,7 @@ #endif #include mousepad/mousepad-private.h +#include mousepad/mousepad-settings.h #include mousepad/mousepad-application.h #include mousepad/mousepad-document.h #include mousepad/mousepad-replace-dialog.h diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c index d248dc9..1f6cb62 100644 --- a/mousepad/mousepad-document.c +++ b/mousepad/mousepad-document.c @@ -29,11 +29,11 @@ #endif #include mousepad/mousepad-private.h +#include mousepad/mousepad-settings.h #include mousepad/mousepad-util.h #include mousepad/mousepad-document.h #include mousepad/mousepad-marshal.h #include mousepad/mousepad-view.h -#include mousepad/mousepad-preferences.h #include mousepad/mousepad-window.h @@ -180,7 +180,6 @@ mousepad_document_init (MousepadDocument *document) gchar*font_name, *color_scheme; gint tab_size; GtkSourceStyleScheme *scheme = NULL; - MousepadPreferences *preferences; /* private structure */ document-priv = MOUSEPAD_DOCUMENT_GET_PRIVATE (document); @@ -217,22 +216,14 @@ mousepad_document_init (MousepadDocument *document) target_list = gtk_drag_dest_get_target_list (GTK_WIDGET (document-textview)); gtk_target_list_add_table (target_list, drop_targets, G_N_ELEMENTS (drop_targets)); - /* preferences */ - preferences = mousepad_preferences_get (); - /* read all the default settings */ - g_object_get (G_OBJECT (preferences), -view-word-wrap, word_wrap, -view-line-numbers, line_numbers, -view-auto-indent, auto_indent, -view-font-name, font_name, -view-tab-size, tab_size, -view-insert-spaces, insert_spaces, -view-color-scheme, color_scheme, -NULL); - - /* release the preferences */ - g_object_unref (G_OBJECT (preferences)); + word_wrap = g_settings_get_boolean (MOUSEPAD_GSETTINGS, view-word-wrap); + line_numbers = g_settings_get_boolean (MOUSEPAD_GSETTINGS, view-line-numbers); + auto_indent = g_settings_get_boolean (MOUSEPAD_GSETTINGS, view-auto-indent); + font_name = g_settings_get_string (MOUSEPAD_GSETTINGS, view-font-name); + tab_size = g_settings_get_int (MOUSEPAD_GSETTINGS, view-tab-size); + insert_spaces = g_settings_get_boolean (MOUSEPAD_GSETTINGS, view-insert-spaces); + color_scheme = g_settings_get_string (MOUSEPAD_GSETTINGS, view-color-scheme); /* set all the settings */ mousepad_document_set_word_wrap (document, word_wrap); diff --git a/mousepad/mousepad-encoding-dialog.c b/mousepad/mousepad-encoding-dialog.c index 31d1c0d..6828452 100644 --- a/mousepad/mousepad-encoding-dialog.c +++ b/mousepad/mousepad-encoding-dialog.c @@ -29,7 +29,6 @@ #include mousepad/mousepad-document.h #include mousepad/mousepad-encoding.h #include mousepad/mousepad-encoding-dialog.h -#include mousepad/mousepad-preferences.h #include mousepad/mousepad-util.h diff --git a/mousepad/mousepad-preferences.c b/mousepad/mousepad-preferences.c deleted file mode 100644 index 90a84d6..000 --- a/mousepad/mousepad-preferences.c +++ /dev/null @@ -1,652 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your
[Xfce4-commits] [apps/mousepad] 05/45: Bind GSettings for view-line-numbers and window-statusbar-visible
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 113029910dfc0a993d5b6fd7150d7912bee7e945
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 03:14:42 2014 -0700
Bind GSettings for view-line-numbers and window-statusbar-visible
---
mousepad/mousepad-view.c |8
mousepad/mousepad-window.c |7 +++
2 files changed, 15 insertions(+)
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index a123241..2943a01 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -25,6 +25,7 @@
#include gdk/gdkkeysyms.h
#include mousepad/mousepad-private.h
+#include mousepad/mousepad-settings.h
#include mousepad/mousepad-util.h
#include mousepad/mousepad-view.h
@@ -154,6 +155,13 @@ mousepad_view_init (MousepadView *view)
g_signal_connect (GTK_TEXT_VIEW (view)-im_context, commit,
G_CALLBACK (mousepad_view_commit_handler), view);
+
+ /* bind Gsettings */
+ g_settings_bind (MOUSEPAD_GSETTINGS,
+ view-line-numbers,
+ view,
+ show-line-numbers,
+ G_SETTINGS_BIND_DEFAULT);
}
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index d958b1a..e65b20b 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -4586,6 +4586,13 @@ mousepad_window_action_statusbar (GtkToggleAction
*action,
{
/* setup a new statusbar */
window-statusbar = mousepad_statusbar_new ();
+
+ g_settings_bind (MOUSEPAD_GSETTINGS,
+ window-statusbar-visible,
+ window-statusbar,
+ visible,
+ G_SETTINGS_BIND_DEFAULT);
+
gtk_box_pack_end (GTK_BOX (window-box), window-statusbar, FALSE,
FALSE, 0);
gtk_widget_show (window-statusbar);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 30/45: Fix one-time leak with keyfile settings backend
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit f95cb2f55644f13e457f746cb2aa9a60f85b228e Author: Matthew Brush mbr...@codebrainz.ca Date: Wed Jul 9 18:22:32 2014 -0700 Fix one-time leak with keyfile settings backend --- mousepad/mousepad-settings.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c index 0f48765..caf9801 100644 --- a/mousepad/mousepad-settings.c +++ b/mousepad/mousepad-settings.c @@ -138,8 +138,9 @@ mousepad_settings_init (void) backend, backend, schema-id, mousepad_schema_ids[i], NULL); - /* TODO: need to cleanup backend reference? */ } + + g_object_unref (backend); } #else for (i = 0; i MOUSEPAD_NUM_SCHEMAS; i++) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 02/45: Add GSettings subclass singleton and related hooks
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 78da59cb7278ef752073791d1eefe33551a41413
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 01:19:45 2014 -0700
Add GSettings subclass singleton and related hooks
---
mousepad/Makefile.am | 11 +-
mousepad/mousepad-application.c|6 +
mousepad/mousepad-private.h|6 +
mousepad/mousepad-settings.c | 157
mousepad/mousepad-settings.h | 24 +++
...s.gschema.xml = org.xfce.Mousepad.gschema.xml} |0
6 files changed, 200 insertions(+), 4 deletions(-)
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index 6230f97..28c536e 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -42,6 +42,8 @@ mousepad_SOURCES = \
mousepad-replace-dialog.h \
mousepad-search-bar.c \
mousepad-search-bar.h \
+ mousepad-settings.c \
+ mousepad-settings.h \
mousepad-statusbar.c \
mousepad-statusbar.h \
mousepad-view.c \
@@ -57,7 +59,8 @@ mousepad_CFLAGS = \
$(GTK_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
- $(PLATFORM_CFLAGS)
+ $(PLATFORM_CFLAGS) \
+ -DMOUSEPAD_GSETTINGS_SCHEMA_DIR=\$(datadir)/glib-2.0/schemas\
mousepad_LDFLAGS = \
-no-undefined \
@@ -113,10 +116,10 @@ endif
EXTRA_DIST = \
mousepad-dbus-infos.xml \
mousepad-marshal.list \
- mousepad-settings.gschema.xml \
- mousepad-window-ui.xml
+ mousepad-window-ui.xml \
+ org.xfce.Mousepad.gschema.xml
-gsettings_SCHEMAS = mousepad-settings.gschema.xml
+gsettings_SCHEMAS = org.xfce.Mousepad.gschema.xml
@GSETTINGS_RULES@
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c
index cb7c778..4ccfa74 100644
--- a/mousepad/mousepad-application.c
+++ b/mousepad/mousepad-application.c
@@ -85,6 +85,9 @@ mousepad_application_init (MousepadApplication *application)
/* cleanup */
g_free (filename);
}
+
+/* Initialize the MousepadSettings singleton if not already initialized */
+MOUSEPAD_GSETTINGS_ONCE_INIT ();
}
@@ -122,6 +125,9 @@ mousepad_application_finalize (GObject *object)
/* cleanup the list of windows */
g_slist_free (application-windows);
+ /* Flush GSettings to disk */
+ MOUSEPAD_GSETTINGS_SYNC ();
+
(*G_OBJECT_CLASS (mousepad_application_parent_class)-finalize) (object);
}
diff --git a/mousepad/mousepad-private.h b/mousepad/mousepad-private.h
index 49ec851..28bcf84 100644
--- a/mousepad/mousepad-private.h
+++ b/mousepad/mousepad-private.h
@@ -21,6 +21,7 @@
#include glib-object.h
#include gtk/gtk.h
#include glib/gi18n.h
+#include gio/gio.h
#include gtksourceview/gtksourceview.h
#include gtksourceview/gtksourcestylescheme.h
#include gtksourceview/gtksourcestyleschememanager.h
@@ -121,6 +122,11 @@ enum
#define mousepad_widget_set_tooltip_text(widget,text)
(mousepad_util_set_tooltip (widget, text))
#endif
+/* settings */
+#define MOUSEPAD_GSETTINGS (G_SETTINGS (mousepad_settings_get_default ()))
+#define MOUSEPAD_GSETTINGS_ONCE_INIT() do { (void) MOUSEPAD_GSETTINGS; } while
(0)
+#define MOUSEPAD_GSETTINGS_SYNC() do { g_settings_sync (); } while (0)
+
G_END_DECLS
#endif /* !__MOUSEPAD_PRIVATE_H__ */
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
new file mode 100644
index 000..6bbbed3
--- /dev/null
+++ b/mousepad/mousepad-settings.c
@@ -0,0 +1,157 @@
+#include mousepad/mousepad-private.h
+#include mousepad/mousepad-settings.h
+#include stdlib.h
+
+/* Needed to use keyfile GSettings backend */
+# define G_SETTINGS_ENABLE_BACKEND
+#include gio/gsettingsbackend.h
+
+
+
+struct MousepadSettings_
+{
+ GSettings parent;
+};
+
+
+
+struct MousepadSettingsClass_
+{
+ GSettingsClass parent_class;
+};
+
+
+
+static void mousepad_settings_finalize (GObject *object);
+
+
+
+G_DEFINE_TYPE (MousepadSettings, mousepad_settings, G_TYPE_SETTINGS)
+
+
+
+/* Global GSettings subclass instance, accessed by
mousepad_settings_get_default() */
+static MousepadSettings *default_settings = NULL;
+
+
+
+static void
+mousepad_settings_class_init (MousepadSettingsClass *klass)
+{
+ GObjectClass *g_object_class;
+
+ g_object_class = G_OBJECT_CLASS (klass);
+
+ g_object_class-finalize = mousepad_settings_finalize;
+}
+
+
+
+static void
+mousepad_settings_finalize (GObject *object)
+{/*
+ MousepadSettings *self;
+
+ g_return_if_fail (MOUSEPAD_IS_SETTINGS (object));
+
+ self = MOUSEPAD_SETTINGS (object);
+*/
+ G_OBJECT_CLASS (mousepad_settings_parent_class)-finalize (object);
+}
+
+
+
+static void
+mousepad_settings_init (MousepadSettings *self)
+{
+}
+
+
+
+/* Called at exit to cleanup the MousepadSettings singleton */
+static void
[Xfce4-commits] [apps/mousepad] 36/45: Add use-default-monospace-font setting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 4b7ffa3ba33aa7ba45aa7950df41ffa9016daa34
Author: Matthew Brush mbr...@codebrainz.ca
Date: Thu Jul 10 14:36:08 2014 -0700
Add use-default-monospace-font setting
And hookup the related widget(s) in the preferences dialog. This new
setting allows to use the default font without overwriting the previous
font-name that was set.
---
mousepad/mousepad-prefs-dialog.c | 10 ++--
mousepad/mousepad-prefs-dialog.glade |2 -
mousepad/mousepad-settings.h |1 +
mousepad/mousepad-view.c | 98
mousepad/org.xfce.Mousepad.gschema.xml |9 +++
5 files changed, 90 insertions(+), 30 deletions(-)
diff --git a/mousepad/mousepad-prefs-dialog.c b/mousepad/mousepad-prefs-dialog.c
index 3562a61..353df21 100644
--- a/mousepad/mousepad-prefs-dialog.c
+++ b/mousepad/mousepad-prefs-dialog.c
@@ -17,7 +17,7 @@
#define WID_HIGHLIGHT_MATCHING_BRACES_CHECK
/prefs/view/display/highlight-braces-check
#define WID_WORD_WRAP_CHECK
/prefs/view/display/word-wrap-check
-#define WID_DEFAULT_FONT_CHECK /prefs/view/font/default-check
+#define WID_USE_DEFAULT_FONT_CHECK /prefs/view/font/default-check
#define WID_FONT_BUTTON /prefs/view/font/chooser-button
#define WID_SCHEME_COMBO/prefs/view/color-scheme-combo
#define WID_SCHEME_MODEL/prefs/view/color-scheme-model
@@ -277,7 +277,6 @@ mousepad_prefs_dialog_home_end_setting_changed
(MousepadPrefsDialog *self,
GSettings *settings)
{
GtkComboBox *combo;
- gint value;
/* don't do anything when the combo box is itself updating the setting */
if (self-blocked)
@@ -335,9 +334,9 @@ mousepad_prefs_dialog_init (MousepadPrefsDialog *self)
g_object_bind_property (check, active, widget, sensitive,
G_BINDING_SYNC_CREATE);
/* enable/disable font chooser button when the default font checkbox is
changed */
- check = mousepad_builder_get_widget (self-builder, WID_DEFAULT_FONT_CHECK);
+ check = mousepad_builder_get_widget (self-builder,
WID_USE_DEFAULT_FONT_CHECK);
widget = mousepad_builder_get_widget (self-builder, WID_FONT_BUTTON);
- g_object_bind_property (check, active, widget, sensitive,
G_BINDING_SYNC_CREATE);
+ g_object_bind_property (check, active, widget, sensitive,
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
/* bind checkboxes to settings */
#define BIND_CHECKBOX(setting) \
@@ -354,6 +353,7 @@ mousepad_prefs_dialog_init (MousepadPrefsDialog *self)
BIND_CHECKBOX (SHOW_RIGHT_MARGIN);
BIND_CHECKBOX (HIGHLIGHT_CURRENT_LINE);
BIND_CHECKBOX (WORD_WRAP);
+ BIND_CHECKBOX (USE_DEFAULT_FONT);
/* Editor */
BIND_CHECKBOX (AUTO_INDENT);
@@ -377,7 +377,7 @@ mousepad_prefs_dialog_init (MousepadPrefsDialog *self)
MOUSEPAD_SETTING_BIND (FONT_NAME,
gtk_builder_get_object (self-builder,
WID_FONT_BUTTON),
font-name,
- G_SETTINGS_BIND_DEFAULT);
+ G_SETTINGS_BIND_DEFAULT |
G_SETTINGS_BIND_NO_SENSITIVITY);
mousepad_prefs_dialog_setup_color_schemes_combo (self);
diff --git a/mousepad/mousepad-prefs-dialog.glade
b/mousepad/mousepad-prefs-dialog.glade
index 365ffeb..ce99499 100644
--- a/mousepad/mousepad-prefs-dialog.glade
+++ b/mousepad/mousepad-prefs-dialog.glade
@@ -272,7 +272,6 @@
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultFalse/property
-property name=activeTrue/property
property name=draw_indicatorTrue/property
/object
packing
@@ -284,7 +283,6 @@
child
object class=GtkFontButton
id=/prefs/view/font/chooser-button
property name=visibleTrue/property
-property name=sensitiveFalse/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
/object
diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h
index 9ddabc0..8aef4d2 100644
--- a/mousepad/mousepad-settings.h
+++ b/mousepad/mousepad-settings.h
@@ -9,6 +9,7 @@ G_BEGIN_DECLS
/* Setting names */
#define MOUSEPAD_SETTING_AUTO_INDENT
/preferences/view/auto-indent
#define MOUSEPAD_SETTING_FONT_NAME
/preferences/view/font-name
+#define MOUSEPAD_SETTING_USE_DEFAULT_FONT
/preferences/view/use-default-monospace-font
#define MOUSEPAD_SETTING_SHOW_WHITESPACE
[Xfce4-commits] [apps/mousepad] 16/45: Use the rest of the GtkSourceView properties with GSettings
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit fd87858d8159032fa94ab168acb8f5390ad71083
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 21:02:05 2014 -0700
Use the rest of the GtkSourceView properties with GSettings
Rename existing settings to make them match GtkSourceView property
names for consistency.
---
mousepad/mousepad-document.c |9 +---
mousepad/mousepad-view.c | 54
mousepad/mousepad-view.h | 12 -
mousepad/mousepad-window.c | 39 +-
mousepad/org.xfce.Mousepad.gschema.xml | 87
5 files changed, 116 insertions(+), 85 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index 40f331e..e520b7b 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -176,9 +176,8 @@ static void
mousepad_document_init (MousepadDocument *document)
{
GtkTargetList*target_list;
- gboolean word_wrap, insert_spaces;
+ gboolean word_wrap;
gchar*color_scheme;
- gint tab_size;
GtkSourceStyleScheme *scheme = NULL;
/* private structure */
@@ -218,14 +217,10 @@ mousepad_document_init (MousepadDocument *document)
/* read all the default settings */
word_wrap = mousepad_settings_get_boolean (view-word-wrap);
- tab_size = mousepad_settings_get_int (view-tab-size);
- insert_spaces = mousepad_settings_get_boolean (view-insert-spaces);
color_scheme = mousepad_settings_get_string (view-color-scheme);
/* set all the settings */
mousepad_document_set_word_wrap (document, word_wrap);
- mousepad_view_set_tab_size (document-textview, tab_size);
- mousepad_view_set_insert_spaces (document-textview, insert_spaces);
if (g_strcmp0 (color_scheme, none) != 0)
scheme = gtk_source_style_scheme_manager_get_scheme
(gtk_source_style_scheme_manager_get_default (), color_scheme);
@@ -286,7 +281,7 @@ mousepad_document_notify_cursor_position (GtkTextBuffer
*buffer,
line = gtk_text_iter_get_line (iter) + 1;
/* get the tab size */
- tab_size = mousepad_view_get_tab_size (document-textview);
+ tab_size = mousepad_settings_get_int (view-tab-width);
/* get the column */
column = mousepad_util_get_real_line_offset (iter, tab_size);
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index f31a6a7..cddb68c 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -213,11 +213,20 @@ mousepad_view_init (MousepadView *view)
G_CALLBACK (mousepad_view_commit_handler), view);
/* bind Gsettings */
- mousepad_settings_bind (view-line-numbers, view, show-line-numbers,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-auto-indent, view, auto-indent,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-font-name, view, font-name,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-show-whitespace, view, show-whitespace,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-show-line-endings, view, show-line-endings,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-highlight-current-line, view,
highlight-current-line, G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-indent-on-tab, view, indent-on-tab,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-indent-width, view, indent-width,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-insert-spaces, view,
insert-spaces-instead-of-tabs, G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-right-margin-position, view,
right-margin-position, G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-show-line-marks, view, show-line-marks,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-show-line-numbers, view, show-line-numbers,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-show-right-margin, view, show-right-margin,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-smart-home-end, view, smart-home-end,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-tab-width, view, tab-width,
G_SETTINGS_BIND_DEFAULT);
}
@@ -2394,29 +2403,6 @@ mousepad_view_indent (MousepadView *view,
-void
-mousepad_view_set_tab_size (MousepadView *view,
- gint tab_size)
-{
- mousepad_return_if_fail (MOUSEPAD_IS_VIEW (view));
- mousepad_return_if_fail (GTK_IS_TEXT_VIEW (view));
-
- gtk_source_view_set_tab_width (GTK_SOURCE_VIEW (view), tab_size);
-}
-
-
-
-void
-mousepad_view_set_insert_spaces (MousepadView *view,
- gboolean insert_spaces)
-{
- mousepad_return_if_fail (MOUSEPAD_IS_VIEW (view));
-
- gtk_source_view_set_insert_spaces_instead_of_tabs (GTK_SOURCE_VIEW (view),
insert_spaces);
-}
-
-
-
gboolean
mousepad_view_get_selection_length
[Xfce4-commits] [apps/mousepad] 25/45: Re-write MousepadSettings to use multiple child schemas
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit d80b40b95542d8a55c75293e0e1a4bc6ba730877
Author: Matthew Brush mbr...@codebrainz.ca
Date: Mon Jul 7 01:39:50 2014 -0700
Re-write MousepadSettings to use multiple child schemas
For view settings, window settings, search state, and window state.
MousepadSettings no longer is a GSettings subclass but rather contains
a GSettings instance for each of the new child schemas.
Also add constants MOUSEPAD_SETTING_* and MOUSEPAD_STATE_* to use
in code in order to reduce changes of a typo slipping by unnoticed.
---
mousepad/mousepad-application.c|6 -
mousepad/mousepad-document.c |3 +-
mousepad/mousepad-private.h| 17 ++-
mousepad/mousepad-replace-dialog.c | 29 +++--
mousepad/mousepad-search-bar.c |8 +-
mousepad/mousepad-settings.c | 218 ++--
mousepad/mousepad-settings.h | 106
mousepad/mousepad-view.c | 39 +++---
mousepad/mousepad-window.c | 110 ++--
mousepad/org.xfce.Mousepad.gschema.xml | 216 +++
10 files changed, 494 insertions(+), 258 deletions(-)
diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c
index 24c9e64..cf0ee44 100644
--- a/mousepad/mousepad-application.c
+++ b/mousepad/mousepad-application.c
@@ -86,9 +86,6 @@ mousepad_application_init (MousepadApplication *application)
/* cleanup */
g_free (filename);
}
-
-/* Initialize the MousepadSettings singleton if not already initialized */
-MOUSEPAD_GSETTINGS_ONCE_INIT ();
}
@@ -126,9 +123,6 @@ mousepad_application_finalize (GObject *object)
/* cleanup the list of windows */
g_slist_free (application-windows);
- /* Flush GSettings to disk */
- MOUSEPAD_GSETTINGS_SYNC ();
-
(*G_OBJECT_CLASS (mousepad_application_parent_class)-finalize) (object);
}
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index d363ce7..0d2819e 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -260,7 +260,8 @@ mousepad_document_notify_cursor_position (GtkTextBuffer
*buffer,
line = gtk_text_iter_get_line (iter) + 1;
/* get the tab size */
- tab_size = mousepad_settings_get_int (view-tab-width);
+ tab_size = mousepad_settings_get_int (MOUSEPAD_SCHEMA_VIEW_SETTINGS,
+MOUSEPAD_SETTING_TAB_WIDTH);
/* get the column */
column = mousepad_util_get_real_line_offset (iter, tab_size);
diff --git a/mousepad/mousepad-private.h b/mousepad/mousepad-private.h
index 28bcf84..5fddbd1 100644
--- a/mousepad/mousepad-private.h
+++ b/mousepad/mousepad-private.h
@@ -122,10 +122,19 @@ enum
#define mousepad_widget_set_tooltip_text(widget,text)
(mousepad_util_set_tooltip (widget, text))
#endif
-/* settings */
-#define MOUSEPAD_GSETTINGS (G_SETTINGS (mousepad_settings_get_default ()))
-#define MOUSEPAD_GSETTINGS_ONCE_INIT() do { (void) MOUSEPAD_GSETTINGS; } while
(0)
-#define MOUSEPAD_GSETTINGS_SYNC() do { g_settings_sync (); } while (0)
+/* Access to the various GSettings instances */
+#define MOUSEPAD_VIEW_SETTINGS \
+ (mousepad_settings_get_from_schema (mousepad_settings_get_default (), \
+ MOUSEPAD_SCHEMA_VIEW_SETTINGS))
+#define MOUSEPAD_WINDOW_SETTINGS \
+ (mousepad_settings_get_from_schema (mousepad_settings_get_default (), \
+ MOUSEPAD_SCHEMA_WINDOW_SETTINGS))
+#define MOUSEPAD_SEARCH_STATE_SETTINGS \
+ (mousepad_settings_get_from_schema (mousepad_settings_get_default (), \
+ MOUSEPAD_SCHEMA_SEARCH_STATE))
+#define MOUSEPAD_WINDOW_STATE_SETTINGS \
+ (mousepad_settings_get_from_schema (mousepad_settings_get_default (), \
+ MOUSEPAD_SCHEMA_WINDOW_STATE))
G_END_DECLS
diff --git a/mousepad/mousepad-replace-dialog.c
b/mousepad/mousepad-replace-dialog.c
index 17c8139..bac000f 100644
--- a/mousepad/mousepad-replace-dialog.c
+++ b/mousepad/mousepad-replace-dialog.c
@@ -126,11 +126,13 @@ mousepad_replace_dialog_bind_setting
(MousepadReplaceDialog *dialog,
{
gchar *signal_name;
- mousepad_settings_bind (key, object, property, G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (MOUSEPAD_SCHEMA_SEARCH_STATE, key,
+ object, property,
+ G_SETTINGS_BIND_DEFAULT);
signal_name = g_strdup_printf (changed::%s, key);
- g_signal_connect_swapped (MOUSEPAD_GSETTINGS,
+ g_signal_connect_swapped (MOUSEPAD_SEARCH_STATE_SETTINGS,
signal_name,
G_CALLBACK
(mousepad_replace_dialog_settings_changed),
dialog);
@@ -227,7 +229,7 @@ mousepad_replace_dialog_init
[Xfce4-commits] [apps/mousepad] 11/45: Remove uneeded code for view-line-numbers setting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit d6ac79f341aabf7b2d0581fab5b3cdbf97570ea4
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 16:57:33 2014 -0700
Remove uneeded code for view-line-numbers setting
Bind each textview's show-line-numbers property to the setting so that
the window code no longer needs to apply it manually. Remove pointless
mousepad_view_get/set_line_numbers() functions since the binding makes
it automatic and it can also be set through the GtkSourceView functions
where needed.
---
mousepad/mousepad-document.c|4 +---
mousepad/mousepad-encoding-dialog.c |2 +-
mousepad/mousepad-view.c| 21 -
mousepad/mousepad-view.h|3 ---
mousepad/mousepad-window.c | 30 ++
5 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index a707308..a25d413 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -176,7 +176,7 @@ static void
mousepad_document_init (MousepadDocument *document)
{
GtkTargetList*target_list;
- gboolean word_wrap, auto_indent, line_numbers, insert_spaces;
+ gboolean word_wrap, auto_indent, insert_spaces;
gchar*font_name, *color_scheme;
gint tab_size;
GtkSourceStyleScheme *scheme = NULL;
@@ -218,7 +218,6 @@ mousepad_document_init (MousepadDocument *document)
/* read all the default settings */
word_wrap = mousepad_settings_get_boolean (view-word-wrap);
- line_numbers = mousepad_settings_get_boolean (view-line-numbers);
auto_indent = mousepad_settings_get_boolean (view-auto-indent);
font_name = mousepad_settings_get_string (view-font-name);
tab_size = mousepad_settings_get_int (view-tab-size);
@@ -228,7 +227,6 @@ mousepad_document_init (MousepadDocument *document)
/* set all the settings */
mousepad_document_set_word_wrap (document, word_wrap);
mousepad_document_set_font (document, font_name);
- mousepad_view_set_line_numbers (document-textview, line_numbers);
mousepad_view_set_auto_indent (document-textview, auto_indent);
mousepad_view_set_tab_size (document-textview, tab_size);
mousepad_view_set_insert_spaces (document-textview, insert_spaces);
diff --git a/mousepad/mousepad-encoding-dialog.c
b/mousepad/mousepad-encoding-dialog.c
index 6828452..fae5e46 100644
--- a/mousepad/mousepad-encoding-dialog.c
+++ b/mousepad/mousepad-encoding-dialog.c
@@ -209,7 +209,7 @@ mousepad_encoding_dialog_init (MousepadEncodingDialog
*dialog)
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (dialog-document), TRUE,
TRUE, 0);
gtk_text_view_set_editable (GTK_TEXT_VIEW (dialog-document-textview),
FALSE);
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW
(dialog-document-textview), FALSE);
- mousepad_view_set_line_numbers (dialog-document-textview, FALSE);
+ gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW
(dialog-document-textview), FALSE);
mousepad_document_set_word_wrap (dialog-document, FALSE);
gtk_widget_show (GTK_WIDGET (dialog-document));
}
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index a8efa63..2b6edcc 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -2281,17 +2281,6 @@ mousepad_view_indent (MousepadView *view,
void
-mousepad_view_set_line_numbers (MousepadView *view,
-gboolean line_numbers)
-{
- mousepad_return_if_fail (MOUSEPAD_IS_VIEW (view));
-
- gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (view), line_numbers);
-}
-
-
-
-void
mousepad_view_set_auto_indent (MousepadView *view,
gboolean auto_indent)
{
@@ -2365,16 +2354,6 @@ mousepad_view_get_selection_length (MousepadView *view,
gboolean
-mousepad_view_get_line_numbers (MousepadView *view)
-{
- mousepad_return_val_if_fail (MOUSEPAD_IS_VIEW (view), FALSE);
-
- return gtk_source_view_get_show_line_numbers (GTK_SOURCE_VIEW (view));
-}
-
-
-
-gboolean
mousepad_view_get_auto_indent (MousepadView *view)
{
mousepad_return_val_if_fail (MOUSEPAD_IS_VIEW (view), FALSE);
diff --git a/mousepad/mousepad-view.h b/mousepad/mousepad-view.h
index 109f7f0..0c6f4e4 100644
--- a/mousepad/mousepad-view.h
+++ b/mousepad/mousepad-view.h
@@ -92,9 +92,6 @@ voidmousepad_view_duplicate
(MousepadView *view
voidmousepad_view_indent(MousepadView
*view,
gint
type);
-voidmousepad_view_set_line_numbers (MousepadView
*view,
- gboolean
line_numbers);
-
voidmousepad_view_set_auto_indent
[Xfce4-commits] [apps/mousepad] 31/45: Change path parsing code to give caller 0-terminated string
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit a33421120dede39fd7cddb383db068531df7bcac
Author: Matthew Brush mbr...@codebrainz.ca
Date: Wed Jul 9 18:51:25 2014 -0700
Change path parsing code to give caller 0-terminated string
Before, it never used the key length so if the path had a trailing
slash it could be used as part of the key. Now the caller gets the
key name, zero-terminated, into the buffer they provide, and it will
only contain the parsed key (assuming the caller's buffer was big
enough).
---
mousepad/mousepad-settings.c | 59 ++
1 file changed, 36 insertions(+), 23 deletions(-)
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index caf9801..f1c462a 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -11,6 +11,10 @@
+#define MOUSEPAD_SETTINGS_MAX_KEY_LEN 512
+
+
+
typedef enum
{
MOUSEPAD_SCHEMA_VIEW_SETTINGS,
@@ -177,7 +181,6 @@ mousepad_settings_check_path_part (const gchar *s,
-
static gboolean
mousepad_settings_parse_path_names (const gchar *path,
const gchar **type,
@@ -276,9 +279,10 @@ mousepad_settings_schema_from_names (const gchar *type,
static MousepadSchema
mousepad_settings_parse_path (const gchar *path,
- const gchar **key_name)
+ gchar*out_key_name, /* out */
+ gsize*out_key_len) /* in/out */
{
- const gchar *type_name, *schema_name;
+ const gchar *type_name, *schema_name, *key_name;
gint type_len, schema_len, key_len;
if (mousepad_settings_parse_path_names (path,
@@ -286,26 +290,29 @@ mousepad_settings_parse_path (const gchar *path,
type_len,
schema_name,
schema_len,
- key_name,
+ key_name,
key_len,
TRUE))
{
MousepadSchema schema;
+ gbooleanhave_key_len = (out_key_len != NULL);
+ gsize max_key_len = have_key_len ? MIN (key_len, *out_key_len)
: key_len;
schema = mousepad_settings_schema_from_names (type_name,
type_len,
schema_name,
schema_len);
- if (schema == MOUSEPAD_NUM_SCHEMAS key_name != NULL)
-*key_name = NULL;
+ /* copy into the caller's string */
+ if (schema != MOUSEPAD_NUM_SCHEMAS out_key_name != NULL)
+strncpy (out_key_name, key_name, max_key_len);
+
+ /* tell caller how much was copied */
+ if (have_key_len)
+*out_key_len = max_key_len;
return schema;
}
- else if (key_name != NULL)
-{
- *key_name = NULL;
-}
return MOUSEPAD_NUM_SCHEMAS;
}
@@ -319,15 +326,16 @@ mousepad_setting_bind (const gchar *path,
GSettingsBindFlags flags)
{
gboolean result = FALSE;
- const gchar *key_name;
MousepadSchema schema;
+ gchar key_name[MOUSEPAD_SETTINGS_MAX_KEY_LEN] = {0};
+ gsize key_len = MOUSEPAD_SETTINGS_MAX_KEY_LEN - 1;
g_return_val_if_fail (path != NULL, FALSE);
g_return_val_if_fail (object != NULL, FALSE);
g_return_val_if_fail (prop != NULL, FALSE);
- schema = mousepad_settings_parse_path (path, key_name);
+ schema = mousepad_settings_parse_path (path, key_name, key_len);
if (G_LIKELY (schema != MOUSEPAD_NUM_SCHEMAS))
{
@@ -349,13 +357,14 @@ mousepad_setting_connect (const gchar *path,
GSignalFlags connect_flags)
{
gulong signal_id = 0;
- const gchar *key_name;
MousepadSchema schema;
+ gchar key_name[MOUSEPAD_SETTINGS_MAX_KEY_LEN] = {0};
+ gsize key_len = MOUSEPAD_SETTINGS_MAX_KEY_LEN - 1;
g_return_val_if_fail (path != NULL, 0);
g_return_val_if_fail (callback != NULL, 0);
- schema = mousepad_settings_parse_path (path, key_name);
+ schema = mousepad_settings_parse_path (path, key_name, key_len);
if (G_LIKELY (schema != MOUSEPAD_NUM_SCHEMAS))
{
@@ -389,7 +398,7 @@ mousepad_setting_disconnect (const gchar *path,
g_return_if_fail (path != NULL);
g_return_if_fail (handler_id 0);
- schema = mousepad_settings_parse_path (path, NULL);
+ schema = mousepad_settings_parse_path (path, NULL, NULL);
if (G_LIKELY (schema != MOUSEPAD_NUM_SCHEMAS))
g_signal_handler_disconnect (mousepad_settings[schema], handler_id);
@@ -405,13 +414,14 @@ mousepad_setting_get (const gchar *path,
...)
{
[Xfce4-commits] [apps/mousepad] 32/45: Refactor GSettings path/schema code into separate class
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 431baa2598ae6b833833159c636bc913a254bc48
Author: Matthew Brush mbr...@codebrainz.ca
Date: Wed Jul 9 21:54:50 2014 -0700
Refactor GSettings path/schema code into separate class
It looks through the main GSettings to find all the keys and recurses
into child schemas to find their keys and it makes up a lookup hash
table that maps key paths to their key name and GSettings instance.
The new code is no longer hardcoded to specific schemas/paths except
for the macros that save typing mistakes for the paths.
---
mousepad/Makefile.am |2 +
mousepad/mousepad-settings-store.c | 279 ++
mousepad/mousepad-settings-store.h | 38
mousepad/mousepad-settings.c | 382 +---
4 files changed, 371 insertions(+), 330 deletions(-)
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index b5e7a7f..fc97c2b 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -45,6 +45,8 @@ mousepad_SOURCES = \
mousepad-search-bar.h \
mousepad-settings.c \
mousepad-settings.h \
+ mousepad-settings-store.c \
+ mousepad-settings-store.h \
mousepad-statusbar.c \
mousepad-statusbar.h \
mousepad-view.c \
diff --git a/mousepad/mousepad-settings-store.c
b/mousepad/mousepad-settings-store.c
new file mode 100644
index 000..16c13ae
--- /dev/null
+++ b/mousepad/mousepad-settings-store.c
@@ -0,0 +1,279 @@
+#include mousepad-settings-store.h
+
+
+
+#ifdef MOUSEPAD_SETTINGS_KEYFILE_BACKEND
+/* Needed to use keyfile GSettings backend */
+# define G_SETTINGS_ENABLE_BACKEND
+# include gio/gsettingsbackend.h
+#endif
+
+
+
+struct MousepadSettingsStore_
+{
+ GObject parent;
+ GSettings *root;
+ GHashTable *keys;
+};
+
+
+
+struct MousepadSettingsStoreClass_
+{
+ GObjectClass parent_class;
+};
+
+
+
+typedef struct
+{
+ const gchar *name;
+ GSettings *settings;
+}
+MousepadSettingKey;
+
+
+
+static void mousepad_settings_store_finalize (GObject *object);
+
+
+
+G_DEFINE_TYPE (MousepadSettingsStore, mousepad_settings_store, G_TYPE_OBJECT)
+
+
+
+static MousepadSettingKey *
+mousepad_setting_key_new (const gchar *key_name,
+ GSettings *settings)
+{
+ MousepadSettingKey *key;
+
+ key = g_slice_new0 (MousepadSettingKey);
+ key-name = g_intern_string (key_name);
+ key-settings = g_object_ref (settings);
+
+ return key;
+}
+
+
+
+static void
+mousepad_setting_key_free (MousepadSettingKey *key)
+{
+ if (G_LIKELY (key != NULL))
+{
+ g_object_unref (key-settings);
+ g_slice_free (MousepadSettingKey, key);
+}
+}
+
+
+
+static void
+mousepad_settings_store_update_env (void)
+{
+ const gchar *old_value = g_getenv (GSETTINGS_SCHEMA_DIR);
+ gchar *new_value = NULL;
+
+ /* append to path */
+ if (old_value != NULL)
+{
+ gchar **paths = g_strsplit (old_value, G_SEARCHPATH_SEPARATOR_S, 0);
+ gchar **paths2;
+ gsize len = g_strv_length (paths);
+
+ paths2 = g_realloc (paths, len + 2);
+ if (paths2 != NULL)
+{
+ paths = paths2;
+ paths[len++] = g_strdup (MOUSEPAD_GSETTINGS_SCHEMA_DIR);
+ paths[len] = NULL;
+ new_value = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, paths);
+}
+ g_strfreev (paths);
+}
+
+ /* set new path */
+ if (new_value == NULL)
+new_value = g_strdup (MOUSEPAD_GSETTINGS_SCHEMA_DIR);
+
+ g_setenv (GSETTINGS_SCHEMA_DIR, new_value, TRUE);
+ g_free(new_value);
+}
+
+
+
+static void
+mousepad_settings_store_class_init (MousepadSettingsStoreClass *klass)
+{
+ GObjectClass *g_object_class;
+
+ g_object_class = G_OBJECT_CLASS (klass);
+
+ g_object_class-finalize = mousepad_settings_store_finalize;
+
+ mousepad_settings_store_update_env ();
+}
+
+
+
+static void
+mousepad_settings_store_finalize (GObject *object)
+{
+ MousepadSettingsStore *self;
+
+ g_return_if_fail (MOUSEPAD_IS_SETTINGS_STORE (object));
+
+ self = MOUSEPAD_SETTINGS_STORE (object);
+
+ g_hash_table_destroy (self-keys);
+
+ g_object_unref (self-root);
+
+ G_OBJECT_CLASS (mousepad_settings_store_parent_class)-finalize (object);
+}
+
+
+
+static void
+mousepad_settings_store_add_key (MousepadSettingsStore *self,
+ const gchar *path,
+ const gchar *key_name,
+ GSettings *settings)
+{
+ MousepadSettingKey *key;
+
+ key = mousepad_setting_key_new (key_name, settings);
+
+ g_hash_table_insert (self-keys, (gpointer) g_intern_string (path), key);
+}
+
+
+
+static void
+mousepad_settings_store_add_settings(MousepadSettingsStore *self,
+ const gchar *path,
+ GSettings *settings)
[Xfce4-commits] [apps/mousepad] 24/45: Move window-height and window-width in schema
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 8df405f985b7a4087937a26a4d2fa6196bd74f87 Author: Matthew Brush mbr...@codebrainz.ca Date: Sun Jul 6 23:21:08 2014 -0700 Move window-height and window-width in schema Put next to window-remember-geometry and improve its description. --- mousepad/org.xfce.Mousepad.gschema.xml | 32 +--- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/mousepad/org.xfce.Mousepad.gschema.xml b/mousepad/org.xfce.Mousepad.gschema.xml index 6083d7b..724ab44 100644 --- a/mousepad/org.xfce.Mousepad.gschema.xml +++ b/mousepad/org.xfce.Mousepad.gschema.xml @@ -204,18 +204,6 @@ !-- Window preferences -- -key name=window-height type=i - default480/default - summaryWindow height/summary - descriptionThe height of window in pixels./description -/key - -key name=window-width type=i - default640/default - summaryWindow width/summary - descriptionThe width of windows in pixels./description -/key - key name=window-statusbar-visible type=b defaulttrue/default summaryStatusbar visible/summary @@ -269,17 +257,23 @@ /description /key +key name=window-height type=i + default480/default + summaryWindow height/summary + descriptionThe height of window in pixels./description +/key + +key name=window-width type=i + default640/default + summaryWindow width/summary + descriptionThe width of windows in pixels./description +/key + key name=window-remember-geometry type=b defaulttrue/default summaryRemember window geometry/summary description -When true the size and position of the window will be saved and restored -for the next window if possible. Note that this feature may not behave -as expected with all window managers as the size and/or position reported -may vary depending on the size of window decorations or the number and -resolutions of currently connected monitors. If your windows are showing -off-screen or in weird locations, set this to false to use your window -manager's default window positioning mechanism. +When true the size of the window will be saved and restored. /description /key -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 04/45: Use DConf (or whatever the default) when DBus support is enabled
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 97c0b8b5d50a2285dab3e835c7bd499aa299e204
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 03:05:46 2014 -0700
Use DConf (or whatever the default) when DBus support is enabled
Instead of explicitly using keyfile backend
---
mousepad/Makefile.am |3 ++-
mousepad/mousepad-settings.c |7 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index b8bdf28..8c6a235 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -80,7 +80,8 @@ mousepad_dbus_sources = \
mousepad_CFLAGS += \
-DDBUS_API_SUBJECT_TO_CHANGE \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS) \
+ -DMOUSEPAD_GSETTINGS_USE_DBUS=1
mousepad_LDADD += \
$(DBUS_LIBS)
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index 678a579..64035e4 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -120,13 +120,15 @@ mousepad_settings_get_default (void)
if (g_once_init_enter (default_initialized))
{
- gchar*conf_file;
GSettingsBackend *backend;
/* If we're installed in an unusual location, we still want to load
* the schema so enforce this with the relevant environment variable. */
mousepad_settings_update_gsettings_schema_dir ();
+#ifndef MOUSEPAD_GSETTINGS_USE_DBUS
+ gchar *conf_file;
+
/* Path inside user's config directory */
conf_file = g_build_filename (g_get_user_config_dir (),
mousepad,
@@ -136,6 +138,9 @@ mousepad_settings_get_default (void)
/* Always use the keyfile backend */
backend = g_keyfile_settings_backend_new (conf_file, /, NULL);
g_free (conf_file);
+#else
+ backend = g_settings_backend_get_default ();
+#endif
/* Construct the singleton instance */
default_settings = g_object_new (
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 44/45: Copy the main menu edit menu to the text view context menu
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit d23ccc48c5ec35ef4ae4c010635068856862f46c Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 03:36:49 2014 -0700 Copy the main menu edit menu to the text view context menu --- mousepad/mousepad-window-ui.xml | 27 +++ 1 file changed, 27 insertions(+) diff --git a/mousepad/mousepad-window-ui.xml b/mousepad/mousepad-window-ui.xml index 07e5afb..922d0a5 100644 --- a/mousepad/mousepad-window-ui.xml +++ b/mousepad/mousepad-window-ui.xml @@ -174,7 +174,34 @@ menuitem action=cut / menuitem action=copy / menuitem action=paste / +menu action=paste-menu + menuitem action=paste-history / + menuitem action=paste-column / +/menu +menuitem action=delete / separator / menuitem action=select-all / +menuitem action=change-selection / +separator / +menu action=convert-menu + menuitem action=lowercase / + menuitem action=uppercase / + menuitem action=titlecase / + menuitem action=opposite-case / + separator / + menuitem action=tabs-to-spaces / + menuitem action=spaces-to-tabs / + separator / + menuitem action=strip-trailing / + separator / + menuitem action=transpose / +/menu +menu action=move-menu + menuitem action=line-up / + menuitem action=line-down / +/menu +menuitem action=duplicate / +menuitem action=increase-indent / +menuitem action=decrease-indent / /popup /ui -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 10/45: Make GSettings keyfile backend a separate compile-time option
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit ad1c4398007177ec8b95c67b205d4b9cf208b070
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 16:32:21 2014 -0700
Make GSettings keyfile backend a separate compile-time option
Rather than using the DBus configure option since the default backend
may not use DBus but Windows registry, or OSX User Defaults, etc.
---
configure.ac.in | 10 ++
mousepad/Makefile.am |8 ++--
mousepad/mousepad-settings.c | 29 -
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index e4c46aa..bcbd94c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -92,6 +92,15 @@ dnl *** Enable support for GSettings ***
dnl
GLIB_GSETTINGS
+AC_ARG_ENABLE([keyfile-settings],
+ [AS_HELP_STRING([--enable-keyfile-settings],
+ [Use the GSettings keyfile backend rather than
the default])],
+ [enable_keyfile_settings=yes],
+ [enable_keyfile_settings=default])
+
+AM_CONDITIONAL([WITH_KEYFILE_SETTINGS],
+ [test x$enable_keyfile_settings = xyes])
+
dnl **
dnl *** Optional support for D-BUS ***
dnl **
@@ -139,4 +148,5 @@ else
echo * D-BUS support: no
fi
echo * Debug Support: $enable_debug
+echo * Use keyfile backend: $enable_keyfile_settings
echo
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index 8c6a235..1e61781 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -80,13 +80,17 @@ mousepad_dbus_sources = \
mousepad_CFLAGS += \
-DDBUS_API_SUBJECT_TO_CHANGE \
- $(DBUS_CFLAGS) \
- -DMOUSEPAD_GSETTINGS_USE_DBUS=1
+ $(DBUS_CFLAGS)
mousepad_LDADD += \
$(DBUS_LIBS)
endif
+if WITH_KEYFILE_SETTINGS
+mousepad_CFLAGS += \
+ -DMOUSEPAD_SETTINGS_KEYFILE_BACKEND=1
+endif
+
if MAINTAINER_MODE
DISTCLEANFILES = \
$(mousepad_built_sources) \
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index d80bf9e..526a77c 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -2,10 +2,11 @@
#include mousepad/mousepad-settings.h
#include stdlib.h
+#ifdef MOUSEPAD_SETTINGS_KEYFILE_BACKEND
/* Needed to use keyfile GSettings backend */
# define G_SETTINGS_ENABLE_BACKEND
-#include gio/gsettingsbackend.h
-
+# include gio/gsettingsbackend.h
+#endif
struct MousepadSettings_
@@ -120,14 +121,14 @@ mousepad_settings_get_default (void)
if (g_once_init_enter (default_initialized))
{
- GSettingsBackend *backend;
/* If we're installed in an unusual location, we still want to load
* the schema so enforce this with the relevant environment variable. */
mousepad_settings_update_gsettings_schema_dir ();
-#ifndef MOUSEPAD_GSETTINGS_USE_DBUS
+#ifdef MOUSEPAD_SETTINGS_KEYFILE_BACKEND
{
+ GSettingsBackend *backend;
gchar *conf_file;
/* Path inside user's config directory */
@@ -136,21 +137,23 @@ mousepad_settings_get_default (void)
settings.conf,
NULL);
- /* Always use the keyfile backend */
+ /* Create a keyfile backend */
backend = g_keyfile_settings_backend_new (conf_file, /, NULL);
g_free (conf_file);
+
+ /* Construct the singleton instance with the keyfile backend */
+ default_settings = g_object_new (MOUSEPAD_TYPE_SETTINGS,
+ backend, backend /* give ref to
settings object */,
+ schema-id, org.xfce.Mousepad,
+ NULL);
}
#else
- backend = g_settings_backend_get_default ();
+ /* Use the default GSettings backend (eg. registry, dconf,
user-defaults, etc) */
+ default_settings = g_object_new (MOUSEPAD_TYPE_SETTINGS,
+ schema-id, org.xfce.Mousepad,
+ NULL);
#endif
- /* Construct the singleton instance */
- default_settings = g_object_new (
-MOUSEPAD_TYPE_SETTINGS,
-backend, backend /* give ref to settings object */,
-schema-id, org.xfce.Mousepad,
-NULL);
-
/* Auto-cleanup at exit */
atexit (mousepad_settings_cleanup_default);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/45: Build system support for GSettings
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 203536a3039200b571aa9cd68f2e2e7f031f98cb
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 00:16:46 2014 -0700
Build system support for GSettings
Including a preliminary, non-tested schema XML file.
---
.gitignore |2 +
Makefile.am|2 +
autogen.sh |2 +
configure.ac.in|6 +
mousepad/Makefile.am |4 +
mousepad/mousepad-settings.gschema.xml | 194
6 files changed, 210 insertions(+)
diff --git a/.gitignore b/.gitignore
index 3e3e61d..893c216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ intltool-merge.in
intltool-update.in
libtool
ltmain.sh
+/m4/
missing
mkinstalldirs
mousepad/.deps/
@@ -30,6 +31,7 @@ mousepad/mousepad
mousepad/mousepad-dbus-infos.h
mousepad/mousepad-marshal.c
mousepad/mousepad-marshal.h
+/mousepad/mousepad-settings.gschema.valid
mousepad/mousepad-window-ui.h
po/.intltool-merge-cache
po/POTFILES
diff --git a/Makefile.am b/Makefile.am
index 1c251d5..964dd9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS =
\
mousepad
\
po
diff --git a/autogen.sh b/autogen.sh
index fb9b80b..da7625e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+mkdir -p m4/ || exit $?
+
(type xdt-autogen) /dev/null 21 || {
cat 2 EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
diff --git a/configure.ac.in b/configure.ac.in
index 1595d44..e4c46aa 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -21,6 +21,7 @@ AC_COPYRIGHT([Copyright (c) 2007-2010
The Xfce development team. All rights reserved.])
AC_INIT([Mousepad], [mousepad_version], [http://bugzilla.xfce.org/],
[mousepad])
AC_PREREQ([2.50])
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET()
AC_REVISION([])
@@ -86,6 +87,11 @@ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.18.0])
XDT_CHECK_PACKAGE([GTKSOURCEVIEW], [gtksourceview-2.0])
+dnl
+dnl *** Enable support for GSettings ***
+dnl
+GLIB_GSETTINGS
+
dnl **
dnl *** Optional support for D-BUS ***
dnl **
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index 3dfb8ac..6230f97 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -113,6 +113,10 @@ endif
EXTRA_DIST = \
mousepad-dbus-infos.xml \
mousepad-marshal.list \
+ mousepad-settings.gschema.xml \
mousepad-window-ui.xml
+gsettings_SCHEMAS = mousepad-settings.gschema.xml
+@GSETTINGS_RULES@
+
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/mousepad/mousepad-settings.gschema.xml
b/mousepad/mousepad-settings.gschema.xml
new file mode 100644
index 000..ca60429
--- /dev/null
+++ b/mousepad/mousepad-settings.gschema.xml
@@ -0,0 +1,194 @@
+schemalist
+ schema id=org.xfce.Mousepad path=/org/xfce/Mousepad/
gettext-domain=mousepad
+
+!-- Search preferences --
+
+key name=search-direction type=i
+ range min=0 max=2/
+ default1/default
+ summarySearch direction/summary
+ description
+When 0 the search direction is backwards/upwards, when 1 the search
+direction is forwards/downwards, when 2 the search will wrap around.
+ /description
+/key
+
+key name=search-match-case type=b
+ defaultfalse/default
+ summaryMatch case/summary
+ description
+When true searches will be case-sensitive, when false they will
+be case-insensitive.
+ /description
+/key
+
+key name=search-match-whole-word type=b
+ defaultfalse/default
+ summaryMatch whole word/summary
+ description
+When true searches must match an entire word (using default word
+boundary characters), when false matches can occur anywhere, even
+within a larger word.
+ /description
+/key
+
+key name=search-replace-all-location type=i
+ range min=0 max=2/
+ default1/default
+ summaryReplace-all location/summary
+ description
+When 0 the replace-all is performed within the current selection, when
+1 the replace-all is performed in the current document, and when 2
+the replace-all is performed in all currently open documents.
+ /description
+/key
+
+!-- Textview preferences --
+
+key name=view-autoindent type=b
+ defaultfalse/default
+ summaryAuto-indentation/summary
+ description
+When true auto-indentation is
[Xfce4-commits] [apps/mousepad] 26/45: Add helper function mousepad_settings_connect_changed()
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit c9b556327cd927b3e1c213b5989dc304d7424bd3
Author: Matthew Brush mbr...@codebrainz.ca
Date: Mon Jul 7 03:21:18 2014 -0700
Add helper function mousepad_settings_connect_changed()
For connecting to GSettings change notifications in one of the
various schemas. Also fix a missed search-replace-all string
literal that didn't get updated in previous commit.
---
mousepad/mousepad-replace-dialog.c | 17 +
mousepad/mousepad-settings.c | 35 +++
mousepad/mousepad-settings.h |6 +
mousepad/mousepad-window.c | 46
4 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/mousepad/mousepad-replace-dialog.c
b/mousepad/mousepad-replace-dialog.c
index bac000f..acf57a2 100644
--- a/mousepad/mousepad-replace-dialog.c
+++ b/mousepad/mousepad-replace-dialog.c
@@ -124,20 +124,15 @@ mousepad_replace_dialog_bind_setting
(MousepadReplaceDialog *dialog,
gpointer object,
const gchar *property)
{
- gchar *signal_name;
-
mousepad_settings_bind (MOUSEPAD_SCHEMA_SEARCH_STATE, key,
object, property,
G_SETTINGS_BIND_DEFAULT);
- signal_name = g_strdup_printf (changed::%s, key);
-
- g_signal_connect_swapped (MOUSEPAD_SEARCH_STATE_SETTINGS,
-signal_name,
-G_CALLBACK
(mousepad_replace_dialog_settings_changed),
-dialog);
-
- g_free (signal_name);
+ mousepad_settings_connect_changed (MOUSEPAD_SCHEMA_SEARCH_STATE,
+ key,
+ G_CALLBACK
(mousepad_replace_dialog_settings_changed),
+ dialog,
+ G_CONNECT_SWAPPED);
}
@@ -494,7 +489,7 @@ mousepad_replace_dialog_settings_changed
(MousepadReplaceDialog *dialog,
MousepadSettings *settings)
{
/* reset occurences label */
- if (g_strcmp0 (key, search-replace-all) == 0)
+ if (g_strcmp0 (key, MOUSEPAD_STATE_SEARCH_REPLACE_ALL) == 0)
gtk_label_set_text (GTK_LABEL (dialog-hits_label), NULL);
mousepad_replace_dialog_changed (dialog);
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index 183bb96..f9fa270 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -231,6 +231,41 @@ mousepad_settings_bind (MousepadSchema schema,
+gulong
+mousepad_settings_connect_changed (MousepadSchema schema,
+ const gchar *key,
+ GCallback callback,
+ gpointer user_data,
+ GSignalFlags connect_flags)
+{
+ gulongsignal_id;
+ gchar*signal_name;
+ MousepadSettings *settings;
+
+ g_return_val_if_fail (schema MOUSEPAD_NUM_SCHEMAS, 0);
+ g_return_val_if_fail (callback != NULL, 0);
+
+ if (key != NULL)
+signal_name = g_strdup_printf (changed::%s, key);
+ else
+signal_name = g_strdup (changed);
+
+ settings = mousepad_settings_get_default ();
+
+ signal_id = g_signal_connect_data (settings-settings[schema],
+ signal_name,
+ callback,
+ user_data,
+ NULL,
+ connect_flags);
+
+ g_free (signal_name);
+
+ return signal_id;
+}
+
+
+
gboolean
mousepad_settings_get_boolean (MousepadSchema schema,
const gchar*key)
diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h
index ac25be7..aeb311b 100644
--- a/mousepad/mousepad-settings.h
+++ b/mousepad/mousepad-settings.h
@@ -41,6 +41,12 @@ void mousepad_settings_bind
(MousepadSchema schema,
const gchar *prop,
GSettingsBindFlags flags);
+gulongmousepad_settings_connect_changed (MousepadSchema schema,
+ const gchar *key,
+ GCallback
callback,
+ gpointer
user_data,
+ GSignalFlags
connect_flags);
+
gboolean mousepad_settings_get_boolean (MousepadSchema schema,
const gchar *key);
diff --git
[Xfce4-commits] [apps/mousepad] 22/45: Keep the UI in sync with the always-show-tabs setting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit cbc5fbef5eeaeb6864003ba86aa6d576579cb627
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 23:10:12 2014 -0700
Keep the UI in sync with the always-show-tabs setting
---
mousepad/mousepad-window.c | 39 +--
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 9a0e839..2dc76d9 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -180,6 +180,9 @@ static void mousepad_window_update_actions
(MousepadW
static gboolean mousepad_window_update_gomenu_idle
(gpointeruser_data);
static void mousepad_window_update_gomenu_idle_destroy
(gpointeruser_data);
static void mousepad_window_update_gomenu
(MousepadWindow *window);
+static void mousepad_window_update_tabs
(MousepadWindow *window,
+ gchar
*key,
+
MousepadSettings *settings);
static void mousepad_window_menu_color_schemes
(MousepadWindow *window);
static void mousepad_window_menu_languages
(MousepadWindow *window);
@@ -563,6 +566,20 @@ mousepad_window_update_window_title (MousepadWindow
*window,
+/* Called when always-show-tabs setting changes to update the UI. */
+static void
+mousepad_window_update_tabs (MousepadWindow *window,
+ gchar*key,
+ MousepadSettings *settings)
+{
+ gint n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK
(window-notebook));
+ gboolean always_show = mousepad_settings_get_boolean
(window-always-show-tabs);
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window-notebook),
+ (n_pages 1 || always_show) ? TRUE : FALSE);
+}
+
+
+
static void
mousepad_window_init (MousepadWindow *window)
{
@@ -733,6 +750,12 @@ mousepad_window_init (MousepadWindow *window)
changed::window-path-in-title,
G_CALLBACK (mousepad_window_update_window_title),
window);
+
+ /* update the tabs when 'always-show-tabs' setting changes */
+ g_signal_connect_swapped (MOUSEPAD_GSETTINGS,
+changed::window-always-show-tabs,
+G_CALLBACK (mousepad_window_update_tabs),
+window);
}
@@ -1475,8 +1498,6 @@ mousepad_window_notebook_added (GtkNotebook *notebook,
MousepadWindow *window)
{
MousepadDocument *document = MOUSEPAD_DOCUMENT (page);
- gboolean always_show_tabs;
- gint npages;
mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
@@ -1493,14 +1514,8 @@ mousepad_window_notebook_added (GtkNotebook
*notebook,
g_signal_connect_swapped (G_OBJECT (document-buffer), modified-changed,
G_CALLBACK (mousepad_window_modified_changed), window);
g_signal_connect (G_OBJECT (document-textview), populate-popup,
G_CALLBACK (mousepad_window_menu_textview_popup), window);
- /* get the number of pages */
- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window-notebook));
-
- /* check tabs should always be visible */
- always_show_tabs = mousepad_settings_get_boolean (window-always-show-tabs);
-
/* change the visibility of the tabs accordingly */
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window-notebook),
always_show_tabs || (npages 1));
+ mousepad_window_update_tabs (window, NULL, NULL);
/* update the go menu */
mousepad_window_update_gomenu (window);
@@ -1514,7 +1529,6 @@ mousepad_window_notebook_removed (GtkNotebook
*notebook,
guintpage_num,
MousepadWindow *window)
{
- gboolean always_show_tabs;
gint npages;
MousepadDocument *document = MOUSEPAD_DOCUMENT (page);
@@ -1548,11 +1562,8 @@ mousepad_window_notebook_removed (GtkNotebook
*notebook,
}
else
{
- /* check tabs should always be visible */
- always_show_tabs = mousepad_settings_get_boolean
(window-always-show-tabs);
-
/* change the visibility of the tabs accordingly */
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window-notebook),
always_show_tabs || (npages 1));
+ mousepad_window_update_tabs (window, NULL, NULL);
/* update the go menu */
mousepad_window_update_gomenu (window);
--
To stop receiving notification
[Xfce4-commits] [apps/mousepad] 15/45: Add view-show-whitespace and view-show-line-endings
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit f0391f0b26ca3769d8172b2502dd482cf7ad26d0
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 20:10:16 2014 -0700
Add view-show-whitespace and view-show-line-endings
Add the properties to MousepadView and make them update the base
GtkSourceView's draw-spaces flags property. Bind GSettings to new
properties.
---
mousepad/mousepad-view.c | 107
mousepad/mousepad-view.h | 10 +++
mousepad/org.xfce.Mousepad.gschema.xml | 19 ++
3 files changed, 136 insertions(+)
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 1956c82..f31a6a7 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -124,6 +124,10 @@ struct _MousepadView
/* the font used in the view */
gchar *font_name;
+
+ /* whitespace visualization */
+ gbooleanshow_whitespace;
+ gbooleanshow_line_endings;
};
@@ -132,6 +136,8 @@ enum
{
PROP_0,
PROP_FONT_NAME,
+ PROP_SHOW_WHITESPACE,
+ PROP_SHOW_LINE_ENDINGS,
NUM_PROPERTIES
};
@@ -167,6 +173,24 @@ mousepad_view_class_init (MousepadViewClass *klass)
The name of the font to use in the view,
MOUSEPAD_VIEW_DEFAULT_FONT,
G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+gobject_class,
+PROP_SHOW_WHITESPACE,
+g_param_spec_boolean (show-whitespace,
+ ShowWhitespace,
+ Whether whitespace is visualized in the view,
+ FALSE,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+gobject_class,
+PROP_SHOW_LINE_ENDINGS,
+g_param_spec_boolean (show-line-endings,
+ ShowLineEndings,
+ Whether line-endings are visualized in the view,
+ FALSE,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
}
@@ -192,6 +216,8 @@ mousepad_view_init (MousepadView *view)
mousepad_settings_bind (view-line-numbers, view, show-line-numbers,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-auto-indent, view, auto-indent,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-font-name, view, font-name,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-show-whitespace, view, show-whitespace,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-show-line-endings, view, show-line-endings,
G_SETTINGS_BIND_DEFAULT);
}
@@ -227,6 +253,12 @@ mousepad_view_set_property (GObject *object,
case PROP_FONT_NAME:
mousepad_view_set_font_name (view, g_value_get_string (value));
break;
+case PROP_SHOW_WHITESPACE:
+ mousepad_view_set_show_whitespace (view, g_value_get_boolean (value));
+ break;
+case PROP_SHOW_LINE_ENDINGS:
+ mousepad_view_set_show_line_endings (view, g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -248,6 +280,12 @@ mousepad_view_get_property (GObject*object,
case PROP_FONT_NAME:
g_value_set_string (value, mousepad_view_get_font_name (view));
break;
+case PROP_SHOW_WHITESPACE:
+ g_value_set_boolean (value, mousepad_view_get_show_whitespace (view));
+ break;
+case PROP_SHOW_LINE_ENDINGS:
+ g_value_set_boolean (value, mousepad_view_get_show_line_endings (view));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2475,6 +2513,29 @@ mousepad_view_set_font_name (MousepadView *view,
+static void
+mousepad_view_update_draw_spaces (MousepadView *view)
+{
+ GtkSourceDrawSpacesFlags flags = 0;
+
+ if (view-show_whitespace)
+{
+ flags |= GTK_SOURCE_DRAW_SPACES_SPACE |
+ GTK_SOURCE_DRAW_SPACES_TAB |
+ GTK_SOURCE_DRAW_SPACES_NBSP |
+ GTK_SOURCE_DRAW_SPACES_LEADING |
+ GTK_SOURCE_DRAW_SPACES_TEXT |
+ GTK_SOURCE_DRAW_SPACES_TRAILING;
+}
+
+ if (view-show_line_endings)
+flags |= GTK_SOURCE_DRAW_SPACES_NEWLINE;
+
+ gtk_source_view_set_draw_spaces (GTK_SOURCE_VIEW (view), flags);
+}
+
+
+
const gchar *
mousepad_view_get_font_name (MousepadView *view)
{
@@ -2482,3 +2543,49 @@ mousepad_view_get_font_name (MousepadView *view)
return view-font_name;
}
+
+
+
+void
+mousepad_view_set_show_whitespace (MousepadView *view,
+ gboolean show)
+{
+ g_return_if_fail (MOUSEPAD_IS_VIEW (view));
+
+ view-show_whitespace = show;
+ mousepad_view_update_draw_spaces (view);
+ g_object_notify (G_OBJECT (view), show-whitespace);
+}
+
+
+
+gboolean
+mousepad_view_get_show_whitespace
[Xfce4-commits] [apps/mousepad] 12/45: Remove uneeded code for view-auto-indent
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit aa8a283d29b33907da969d1f4ff65cd8ad364d9e
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 17:21:53 2014 -0700
Remove uneeded code for view-auto-indent
---
mousepad/mousepad-document.c |4 +---
mousepad/mousepad-view.c | 22 +-
mousepad/mousepad-view.h |5 -
mousepad/mousepad-window.c | 17 +
4 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index a25d413..6da62fa 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -176,7 +176,7 @@ static void
mousepad_document_init (MousepadDocument *document)
{
GtkTargetList*target_list;
- gboolean word_wrap, auto_indent, insert_spaces;
+ gboolean word_wrap, insert_spaces;
gchar*font_name, *color_scheme;
gint tab_size;
GtkSourceStyleScheme *scheme = NULL;
@@ -218,7 +218,6 @@ mousepad_document_init (MousepadDocument *document)
/* read all the default settings */
word_wrap = mousepad_settings_get_boolean (view-word-wrap);
- auto_indent = mousepad_settings_get_boolean (view-auto-indent);
font_name = mousepad_settings_get_string (view-font-name);
tab_size = mousepad_settings_get_int (view-tab-size);
insert_spaces = mousepad_settings_get_boolean (view-insert-spaces);
@@ -227,7 +226,6 @@ mousepad_document_init (MousepadDocument *document)
/* set all the settings */
mousepad_document_set_word_wrap (document, word_wrap);
mousepad_document_set_font (document, font_name);
- mousepad_view_set_auto_indent (document-textview, auto_indent);
mousepad_view_set_tab_size (document-textview, tab_size);
mousepad_view_set_insert_spaces (document-textview, insert_spaces);
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 2b6edcc..6597219 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -158,6 +158,7 @@ mousepad_view_init (MousepadView *view)
/* bind Gsettings */
mousepad_settings_bind (view-line-numbers, view, show-line-numbers,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-auto-indent, view, auto-indent,
G_SETTINGS_BIND_DEFAULT);
}
@@ -2281,17 +2282,6 @@ mousepad_view_indent (MousepadView *view,
void
-mousepad_view_set_auto_indent (MousepadView *view,
- gboolean auto_indent)
-{
- mousepad_return_if_fail (MOUSEPAD_IS_VIEW (view));
-
- gtk_source_view_set_auto_indent (GTK_SOURCE_VIEW (view), auto_indent);
-}
-
-
-
-void
mousepad_view_set_tab_size (MousepadView *view,
gint tab_size)
{
@@ -2353,16 +2343,6 @@ mousepad_view_get_selection_length (MousepadView *view,
-gboolean
-mousepad_view_get_auto_indent (MousepadView *view)
-{
- mousepad_return_val_if_fail (MOUSEPAD_IS_VIEW (view), FALSE);
-
- return gtk_source_view_get_auto_indent (GTK_SOURCE_VIEW (view));
-}
-
-
-
gint
mousepad_view_get_tab_size (MousepadView *view)
{
diff --git a/mousepad/mousepad-view.h b/mousepad/mousepad-view.h
index 0c6f4e4..aff9422 100644
--- a/mousepad/mousepad-view.h
+++ b/mousepad/mousepad-view.h
@@ -92,9 +92,6 @@ voidmousepad_view_duplicate
(MousepadView *view
voidmousepad_view_indent(MousepadView
*view,
gint
type);
-voidmousepad_view_set_auto_indent (MousepadView
*view,
- gboolean
auto_indent);
-
voidmousepad_view_set_tab_size (MousepadView
*view,
gint
tab_size);
@@ -106,8 +103,6 @@ gintmousepad_view_get_selection_length
(MousepadView *view
gbooleanmousepad_view_get_line_numbers (MousepadView
*view);
-gbooleanmousepad_view_get_auto_indent (MousepadView
*view);
-
gintmousepad_view_get_tab_size (MousepadView
*view);
gbooleanmousepad_view_get_insert_spaces (MousepadView
*view);
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index d5dcbed..d3fd22b 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -2255,7 +2255,7 @@ mousepad_window_update_actions (MousepadWindow *window)
action = gtk_action_group_get_action (window-action_group,
line-numbers);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
- active = mousepad_view_get_auto_indent (document-textview);
+ active = mousepad_settings_get_boolean (view-auto-indent);
action = gtk_action_group_get_action
[Xfce4-commits] [apps/mousepad] 18/45: Move word-wrap from MousepadDocument to MousepadView
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit b48d3d76a52f0883e30140a1a526432daa69aedf
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 21:57:05 2014 -0700
Move word-wrap from MousepadDocument to MousepadView
And bind from GSettings. Remove now uneeded code from this change and
also some for previous color-scheme property addition.
---
mousepad/mousepad-document.c| 47 ---
mousepad/mousepad-document.h|3 ---
mousepad/mousepad-encoding-dialog.c |2 +-
mousepad/mousepad-view.c| 44
mousepad/mousepad-view.h|5
mousepad/mousepad-window.c |5 +---
6 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index e520b7b..d363ce7 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -96,9 +96,6 @@ struct _MousepadDocumentPrivate
/* utf-8 valid document names */
gchar *utf8_filename;
gchar *utf8_basename;
-
- /* settings */
- guintword_wrap : 1;
};
@@ -176,9 +173,6 @@ static void
mousepad_document_init (MousepadDocument *document)
{
GtkTargetList*target_list;
- gboolean word_wrap;
- gchar*color_scheme;
- GtkSourceStyleScheme *scheme = NULL;
/* private structure */
document-priv = MOUSEPAD_DOCUMENT_GET_PRIVATE (document);
@@ -215,21 +209,6 @@ mousepad_document_init (MousepadDocument *document)
target_list = gtk_drag_dest_get_target_list (GTK_WIDGET
(document-textview));
gtk_target_list_add_table (target_list, drop_targets, G_N_ELEMENTS
(drop_targets));
- /* read all the default settings */
- word_wrap = mousepad_settings_get_boolean (view-word-wrap);
- color_scheme = mousepad_settings_get_string (view-color-scheme);
-
- /* set all the settings */
- mousepad_document_set_word_wrap (document, word_wrap);
-
- if (g_strcmp0 (color_scheme, none) != 0)
-scheme = gtk_source_style_scheme_manager_get_scheme
(gtk_source_style_scheme_manager_get_default (), color_scheme);
- gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER
(document-buffer), (scheme != NULL));
- gtk_source_buffer_set_style_scheme (GTK_SOURCE_BUFFER (document-buffer),
scheme);
-
- /* cleanup */
- g_free (color_scheme);
-
/* attach signals to the text view and buffer */
g_signal_connect (G_OBJECT (document-buffer), notify::cursor-position,
G_CALLBACK (mousepad_document_notify_cursor_position), document);
g_signal_connect (G_OBJECT (document-buffer), notify::has-selection,
G_CALLBACK (mousepad_document_notify_has_selection), document);
@@ -463,22 +442,6 @@ mousepad_document_set_overwrite (MousepadDocument
*document,
void
-mousepad_document_set_word_wrap (MousepadDocument *document,
- gboolean word_wrap)
-{
- mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
-
- /* store the setting */
- document-priv-word_wrap = word_wrap;
-
- /* set the wrapping mode */
- gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (document-textview),
- word_wrap ? GTK_WRAP_WORD : GTK_WRAP_NONE);
-}
-
-
-
-void
mousepad_document_focus_textview (MousepadDocument *document)
{
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
@@ -598,13 +561,3 @@ mousepad_document_get_filename (MousepadDocument *document)
return document-priv-utf8_filename;
}
-
-
-
-gboolean
-mousepad_document_get_word_wrap (MousepadDocument *document)
-{
- mousepad_return_val_if_fail (MOUSEPAD_IS_DOCUMENT (document), FALSE);
-
- return document-priv-word_wrap;
-}
diff --git a/mousepad/mousepad-document.h b/mousepad/mousepad-document.h
index cbe3f4f..41a720e 100644
--- a/mousepad/mousepad-document.h
+++ b/mousepad/mousepad-document.h
@@ -63,9 +63,6 @@ MousepadDocument *mousepad_document_new(void);
void mousepad_document_set_overwrite (MousepadDocument *document,
gboolean
overwrite);
-void mousepad_document_set_word_wrap (MousepadDocument *document,
-gboolean
word_wrap);
-
void mousepad_document_focus_textview (MousepadDocument
*document);
void mousepad_document_send_signals (MousepadDocument
*document);
diff --git a/mousepad/mousepad-encoding-dialog.c
b/mousepad/mousepad-encoding-dialog.c
index fae5e46..9a0fc3e 100644
--- a/mousepad/mousepad-encoding-dialog.c
+++ b/mousepad/mousepad-encoding-dialog.c
@@ -210,7 +210,7 @@ mousepad_encoding_dialog_init (MousepadEncodingDialog
*dialog)
gtk_text_view_set_editable (GTK_TEXT_VIEW (dialog-document-textview),
FALSE);
gtk_text_view_set_cursor_visible
[Xfce4-commits] [apps/mousepad] 40/45: Disconnect font-name setting callback
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit f94cf638ff474e822fdda7c1aaf6993cff86f309 Author: Matthew Brush mbr...@codebrainz.ca Date: Thu Jul 10 23:43:28 2014 -0700 Disconnect font-name setting callback Otherwise GSettings keeps calling back to destructed views. --- mousepad/mousepad-view.c | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c index d362973..7f0bd91 100644 --- a/mousepad/mousepad-view.c +++ b/mousepad/mousepad-view.c @@ -126,6 +126,7 @@ struct _MousepadView /* the font used in the view */ gchar*font_name; PangoFontDescription *font_desc; + gulongfont_handler; /* whitespace visualization */ gboolean show_whitespace; @@ -262,6 +263,7 @@ mousepad_view_init (MousepadView *view) view-color_scheme = g_strdup (none); view-font_name = NULL; view-font_desc = NULL; + view-font_handler = 0; /* make sure any buffers set on the view get the color scheme applied to them */ g_signal_connect (view, @@ -298,10 +300,11 @@ mousepad_view_init (MousepadView *view) BIND_ (WORD_WRAP, word-wrap); /* override with default font when the setting is enabled */ - MOUSEPAD_SETTING_CONNECT (USE_DEFAULT_FONT, -G_CALLBACK (mousepad_view_use_default_font_setting_changed), -view, -G_CONNECT_SWAPPED); + view-font_handler = +MOUSEPAD_SETTING_CONNECT (USE_DEFAULT_FONT, + G_CALLBACK (mousepad_view_use_default_font_setting_changed), + view, + G_CONNECT_SWAPPED); #undef BIND_ } @@ -317,6 +320,10 @@ mousepad_view_finalize (GObject *object) if (G_UNLIKELY (view-selection_timeout_id != 0)) g_source_remove (view-selection_timeout_id); + /* disconnect the settings changed callback */ + if (view-font_handler 0) +MOUSEPAD_SETTING_DISCONNECT (FONT_NAME, view-font_handler); + /* free the selection marks list (marks are owned by the buffer) */ if (G_UNLIKELY (view-selection_marks != NULL)) g_slist_free (view-selection_marks); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 23/45: Keep the UI in sync with the recent-menu-items setting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit e0ff5aa62ca909ac3a1ff4138c32c411e4c07311
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 23:16:31 2014 -0700
Keep the UI in sync with the recent-menu-items setting
---
mousepad/mousepad-window.c | 16
1 file changed, 16 insertions(+)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 2dc76d9..11d258b 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -580,6 +580,16 @@ mousepad_window_update_tabs (MousepadWindow *window,
+/* Called when 'window-recent-menu-items' setting changes to update the UI. */
+static void
+mousepad_window_update_recent_menu (MousepadWindow *window,
+gchar*key,
+MousepadSettings *settings)
+{
+ mousepad_window_recent_menu (window);
+}
+
+
static void
mousepad_window_init (MousepadWindow *window)
{
@@ -756,6 +766,12 @@ mousepad_window_init (MousepadWindow *window)
changed::window-always-show-tabs,
G_CALLBACK (mousepad_window_update_tabs),
window);
+
+ /* update the recent items menu when 'window-recent-menu-items' setting
changes */
+ g_signal_connect_swapped (MOUSEPAD_GSETTINGS,
+changed::window-recent-menu-items,
+G_CALLBACK (mousepad_window_update_recent_menu),
+window);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 07/45: Use GSettings for MousepadReplaceDialog search settings
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 19182c7830191676f638c23d0892ba2bdee6f32d
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 14:33:01 2014 -0700
Use GSettings for MousepadReplaceDialog search settings
Add new setting search-replace-all to control the checkbox for it
in the dialog. Refactor search-replace-all callback into _changed()
function.
---
mousepad/mousepad-replace-dialog.c | 229
mousepad/org.xfce.Mousepad.gschema.xml |9 ++
2 files changed, 92 insertions(+), 146 deletions(-)
diff --git a/mousepad/mousepad-replace-dialog.c
b/mousepad/mousepad-replace-dialog.c
index 1f29863..9828d3e 100644
--- a/mousepad/mousepad-replace-dialog.c
+++ b/mousepad/mousepad-replace-dialog.c
@@ -32,23 +32,16 @@
-static void mousepad_replace_dialog_unrealize
(GtkWidget *widget);
-static void mousepad_replace_dialog_finalize
(GObject*object);
-static void mousepad_replace_dialog_response
(GtkWidget *widget,
-
gintresponse_id);
-static void mousepad_replace_dialog_changed
(MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_case_sensitive_toggled
(GtkToggleButton*button,
-
MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_whole_word_toggled
(GtkToggleButton*button,
-
MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_replace_all_toggled
(GtkToggleButton*button,
-
MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_search_location_changed
(GtkComboBox*combo,
-
MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_direction_changed
(GtkComboBox*combo,
-
MousepadReplaceDialog *dialog);
-static void mousepad_replace_dialog_history_combo_box
(GtkComboBox*combo_box);
-static void mousepad_replace_dialog_history_insert_text
(const gchar*text);
+static void mousepad_replace_dialog_unrealize
(GtkWidget *widget);
+static void mousepad_replace_dialog_finalize
(GObject *object);
+static void mousepad_replace_dialog_response
(GtkWidget *widget,
+ gint
response_id);
+static void mousepad_replace_dialog_changed
(MousepadReplaceDialog *dialog);
+static void mousepad_replace_dialog_settings_changed
(MousepadReplaceDialog *dialog,
+ gchar
*key,
+
MousepadSettings *settings);
+static void mousepad_replace_dialog_history_combo_box
(GtkComboBox *combo_box);
+static void mousepad_replace_dialog_history_insert_text (const
gchar *text);
@@ -68,13 +61,6 @@ struct _MousepadReplaceDialog
GtkWidget *replace_button;
GtkWidget *search_location_combo;
GtkWidget *hits_label;
-
- /* search flags */
- guintsearch_direction;
- guintmatch_case : 1;
- guintmatch_whole_word : 1;
- guintreplace_all : 1;
- guintreplace_all_location;
};
enum
@@ -133,27 +119,36 @@ mousepad_replace_dialog_class_init
(MousepadReplaceDialogClass *klass)
static void
-mousepad_replace_dialog_init (MousepadReplaceDialog *dialog)
+mousepad_replace_dialog_bind_setting (MousepadReplaceDialog *dialog,
+ const gchar *key,
+ gpointer object,
+ const gchar *property)
{
- GtkWidget*vbox, *hbox, *combo, *label, *check;
- GtkSizeGroup *size_group;
- gboolean match_whole_word, match_case;
- gint search_direction,
[Xfce4-commits] [apps/mousepad] 37/45: Add fullscreen support
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit a3a9517357d28aa6a7701fd600b5cfc327076ecb
Author: Matthew Brush mbr...@codebrainz.ca
Date: Thu Jul 10 14:59:03 2014 -0700
Add fullscreen support
Also remove close window button from the toolbar.
---
mousepad/mousepad-settings.h |1 +
mousepad/mousepad-window-ui.xml|4 +++-
mousepad/mousepad-window.c | 31 +++
mousepad/org.xfce.Mousepad.gschema.xml |7 +++
4 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h
index 8aef4d2..b5bf091 100644
--- a/mousepad/mousepad-settings.h
+++ b/mousepad/mousepad-settings.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
#define MOUSEPAD_SETTING_SEARCH_REPLACE_ALL_LOCATION
/state/search/replace-all-location
#define MOUSEPAD_SETTING_WINDOW_HEIGHT /state/window/height
#define MOUSEPAD_SETTING_WINDOW_WIDTH/state/window/width
+#define MOUSEPAD_SETTING_WINDOW_FULLSCREEN /state/window/fullscreen
void mousepad_settings_init (void);
void mousepad_settings_finalize (void);
diff --git a/mousepad/mousepad-window-ui.xml b/mousepad/mousepad-window-ui.xml
index 494b5b1..07e5afb 100644
--- a/mousepad/mousepad-window-ui.xml
+++ b/mousepad/mousepad-window-ui.xml
@@ -101,6 +101,8 @@
separator /
menuitem action=toolbar /
menuitem action=statusbar /
+ separator /
+ menuitem action=fullscreen /
/menu
menu action=document-menu
@@ -152,7 +154,7 @@
toolitem action=replace /
toolitem action=go-to /
separator /
- toolitem action=close-window /
+ toolitem action=fullscreen /
/toolbar
popup action=tab-menu
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 40fc9ee..783f7dc 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -330,6 +330,8 @@ static void
mousepad_window_action_statusbar_overwrite (MousepadW
gbooleanoverwrite);
static void mousepad_window_action_statusbar
(GtkToggleAction*action,
MousepadWindow *window);
+static void mousepad_window_action_fullscreen
(GtkToggleAction*action,
+
MousepadWindow *window);
static void mousepad_window_action_language
(GtkToggleAction*action,
MousepadWindow *window);
static void mousepad_window_action_auto_indent
(GtkToggleAction*action,
@@ -478,6 +480,7 @@ static const GtkToggleActionEntry toggle_action_entries[] =
{ line-numbers, NULL, N_(Line N_umbers), NULL, N_(Show line numbers),
G_CALLBACK (mousepad_window_action_line_numbers), FALSE, },
{ toolbar, NULL, N_(_Toolbar), NULL, N_(Change the visibility of the
toolbar), G_CALLBACK (mousepad_window_action_toolbar), FALSE, },
{ statusbar, NULL, N_(St_atusbar), NULL, N_(Change the visibility of
the statusbar), G_CALLBACK (mousepad_window_action_statusbar), FALSE, },
+ { fullscreen, GTK_STOCK_FULLSCREEN, N_(_Fullscreen), NULL, N_(Make the
window fullscreen), G_CALLBACK (mousepad_window_action_fullscreen), FALSE, },
{ auto-indent, NULL, N_(_Auto Indent), NULL, N_(Auto indent a new
line), G_CALLBACK (mousepad_window_action_auto_indent), FALSE, },
{ insert-spaces, NULL, N_(Insert _Spaces), NULL, N_(Insert spaces when
the tab button is pressed), G_CALLBACK (mousepad_window_action_insert_spaces),
FALSE, },
{ word-wrap, NULL, N_(_Word Wrap), NULL, N_(Toggle breaking lines in
between words), G_CALLBACK (mousepad_window_action_word_wrap), FALSE, },
@@ -700,6 +703,10 @@ mousepad_window_init (MousepadWindow *window)
/* update the toolbar visibility with the setting */
MOUSEPAD_SETTING_BIND (TOOLBAR_VISIBLE, toolbar, visible,
G_SETTINGS_BIND_DEFAULT);
+ /* update the window fullscreen state when setting changes */
+ action = gtk_action_group_get_action (window-action_group, fullscreen);
+ MOUSEPAD_SETTING_BIND (WINDOW_FULLSCREEN, action, active,
G_SETTINGS_BIND_DEFAULT);
+
/* check if we need to add the root warning */
if (G_UNLIKELY (geteuid () == 0))
{
@@ -4863,6 +4870,30 @@ mousepad_window_action_statusbar (GtkToggleAction
*action,
static void
+mousepad_window_action_fullscreen (GtkToggleAction *action,
+ MousepadWindow *window)
+{
+ gboolean fullscreen;
+
+ fullscreen = MOUSEPAD_SETTING_GET_BOOLEAN (WINDOW_FULLSCREEN);
+
+ if (fullscreen)
+{
+ gtk_window_fullscreen
[Xfce4-commits] [apps/mousepad] 43/45: Bump GLib and GTK+ dependency versions
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit b32b1b182b87654bdebb01b09b9f3806f5e6e467 Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 03:19:42 2014 -0700 Bump GLib and GTK+ dependency versions Versions from: https://wiki.xfce.org/releng/4.12/roadmap --- README |3 ++- configure.ac.in |6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index 0c53e33..7264ae1 100644 --- a/README +++ b/README @@ -21,7 +21,8 @@ Required packages Mousepad depends on the following packages: - - Gtk+ 2.20.0 or above + - Gtk+ 2.24.0 or above + - GLib 2.30.0 or above - Libxfce4util 4.4.0 or above - GtkSourceView 2.2.2 or above diff --git a/configure.ac.in b/configure.ac.in index bcbd94c..412b96f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -82,9 +82,9 @@ XDT_I18N([@LINGUAS@]) dnl *** dnl *** Check for required packages *** dnl *** -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.18.0]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GTKSOURCEVIEW], [gtksourceview-2.0]) dnl -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 39/45: Change default of a couple settings
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 473af3d8b11943cea9b9b51384f8dc0d98a6ef3a Author: Matthew Brush mbr...@codebrainz.ca Date: Thu Jul 10 22:46:09 2014 -0700 Change default of a couple settings --- mousepad/org.xfce.mousepad.gschema.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mousepad/org.xfce.mousepad.gschema.xml b/mousepad/org.xfce.mousepad.gschema.xml index 17dd78f..acab4b4 100644 --- a/mousepad/org.xfce.mousepad.gschema.xml +++ b/mousepad/org.xfce.mousepad.gschema.xml @@ -67,7 +67,7 @@ /description /key key name=highlight-current-line type=b - defaulttrue/default + defaultfalse/default summaryHighlight current line/summary description When true visually indicate the line with the caret on it, when false @@ -169,7 +169,7 @@ /description /key key name=statusbar-visible type=b - defaulttrue/default + defaultfalse/default summaryStatusbar visible/summary description When true the statusbar is visible, when false it is not visible. -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 13/45: Refactor for view-font-name GSetting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 8b224a3ea10c73d094390b1f3daf4271bb958ebe
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 17:53:54 2014 -0700
Refactor for view-font-name GSetting
Move _set_font() from MousepadDocument to MousepadView. Add glue to
bind the setting change to update the view's font.
---
mousepad/mousepad-document.c | 24 +--
mousepad/mousepad-document.h |3 ---
mousepad/mousepad-view.c | 54 ++
mousepad/mousepad-view.h |2 ++
mousepad/mousepad-window.c | 18 --
5 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index 6da62fa..40f331e 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -177,7 +177,7 @@ mousepad_document_init (MousepadDocument *document)
{
GtkTargetList*target_list;
gboolean word_wrap, insert_spaces;
- gchar*font_name, *color_scheme;
+ gchar*color_scheme;
gint tab_size;
GtkSourceStyleScheme *scheme = NULL;
@@ -218,14 +218,12 @@ mousepad_document_init (MousepadDocument *document)
/* read all the default settings */
word_wrap = mousepad_settings_get_boolean (view-word-wrap);
- font_name = mousepad_settings_get_string (view-font-name);
tab_size = mousepad_settings_get_int (view-tab-size);
insert_spaces = mousepad_settings_get_boolean (view-insert-spaces);
color_scheme = mousepad_settings_get_string (view-color-scheme);
/* set all the settings */
mousepad_document_set_word_wrap (document, word_wrap);
- mousepad_document_set_font (document, font_name);
mousepad_view_set_tab_size (document-textview, tab_size);
mousepad_view_set_insert_spaces (document-textview, insert_spaces);
@@ -235,7 +233,6 @@ mousepad_document_init (MousepadDocument *document)
gtk_source_buffer_set_style_scheme (GTK_SOURCE_BUFFER (document-buffer),
scheme);
/* cleanup */
- g_free (font_name);
g_free (color_scheme);
/* attach signals to the text view and buffer */
@@ -487,25 +484,6 @@ mousepad_document_set_word_wrap (MousepadDocument
*document,
void
-mousepad_document_set_font (MousepadDocument *document,
-const gchar *font_name)
-{
- PangoFontDescription *font_desc;
-
- mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
-
- if (G_LIKELY (font_name))
-{
- /* set the widget font */
- font_desc = pango_font_description_from_string (font_name);
- gtk_widget_modify_font (GTK_WIDGET (document-textview), font_desc);
- pango_font_description_free (font_desc);
-}
-}
-
-
-
-void
mousepad_document_focus_textview (MousepadDocument *document)
{
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
diff --git a/mousepad/mousepad-document.h b/mousepad/mousepad-document.h
index f2176c1..cbe3f4f 100644
--- a/mousepad/mousepad-document.h
+++ b/mousepad/mousepad-document.h
@@ -60,9 +60,6 @@ GType mousepad_document_get_type (void)
G_GNUC_CONST;
MousepadDocument *mousepad_document_new(void);
-void mousepad_document_set_font (MousepadDocument *document,
-const gchar
*font_name);
-
void mousepad_document_set_overwrite (MousepadDocument *document,
gboolean
overwrite);
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 6597219..80ed437 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -139,9 +139,52 @@ mousepad_view_class_init (MousepadViewClass *klass)
+void
+mousepad_view_set_font_name (MousepadView *view,
+ const gchar *font_name)
+{
+ PangoFontDescription *font_desc;
+
+ g_return_if_fail (MOUSEPAD_IS_VIEW (view));
+
+ if (font_name == NULL)
+font_name = Monospace;
+
+ font_desc = pango_font_description_from_string (font_name);
+
+ if (G_LIKELY (font_desc != NULL))
+{
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_override_font (GTK_WIDGET (view), font_desc);
+#else
+ gtk_widget_modify_font (GTK_WIDGET (view), font_desc);
+#endif
+ pango_font_description_free (font_desc);
+}
+ else
+g_critical (Invalid font-name given: %s, font_name);
+}
+
+
+
+/* when the view-font-name setting changes, update the view to use that font */
+static void
+mousepad_view_font_name_setting_changed (MousepadView *view,
+ gchar*key,
+ MousepadSettings *settings)
+{
+ gchar *font_name = mousepad_settings_get_string (view-font-name);
+ mousepad_view_set_font_name (view, font_name);
+ g_free (font_name);
+}
+
[Xfce4-commits] [apps/mousepad] 08/45: Add GSettings wrapper functions to mousepad-settings.h
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit f8a4bed9c0f394d1a4b78e39cddea8212387da17
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 16:00:11 2014 -0700
Add GSettings wrapper functions to mousepad-settings.h
And use them everywhere that g_settings functions were used.
---
mousepad/mousepad-document.c | 14 -
mousepad/mousepad-replace-dialog.c | 18 +--
mousepad/mousepad-search-bar.c |8 ++---
mousepad/mousepad-settings.h | 23 ++
mousepad/mousepad-view.c |6 +---
mousepad/mousepad-window.c | 60 +---
6 files changed, 69 insertions(+), 60 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index 1f6cb62..a707308 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -217,13 +217,13 @@ mousepad_document_init (MousepadDocument *document)
gtk_target_list_add_table (target_list, drop_targets, G_N_ELEMENTS
(drop_targets));
/* read all the default settings */
- word_wrap = g_settings_get_boolean (MOUSEPAD_GSETTINGS, view-word-wrap);
- line_numbers = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
view-line-numbers);
- auto_indent = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
view-auto-indent);
- font_name = g_settings_get_string (MOUSEPAD_GSETTINGS, view-font-name);
- tab_size = g_settings_get_int (MOUSEPAD_GSETTINGS, view-tab-size);
- insert_spaces = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
view-insert-spaces);
- color_scheme = g_settings_get_string (MOUSEPAD_GSETTINGS,
view-color-scheme);
+ word_wrap = mousepad_settings_get_boolean (view-word-wrap);
+ line_numbers = mousepad_settings_get_boolean (view-line-numbers);
+ auto_indent = mousepad_settings_get_boolean (view-auto-indent);
+ font_name = mousepad_settings_get_string (view-font-name);
+ tab_size = mousepad_settings_get_int (view-tab-size);
+ insert_spaces = mousepad_settings_get_boolean (view-insert-spaces);
+ color_scheme = mousepad_settings_get_string (view-color-scheme);
/* set all the settings */
mousepad_document_set_word_wrap (document, word_wrap);
diff --git a/mousepad/mousepad-replace-dialog.c
b/mousepad/mousepad-replace-dialog.c
index 9828d3e..17c8139 100644
--- a/mousepad/mousepad-replace-dialog.c
+++ b/mousepad/mousepad-replace-dialog.c
@@ -126,11 +126,7 @@ mousepad_replace_dialog_bind_setting
(MousepadReplaceDialog *dialog,
{
gchar *signal_name;
- g_settings_bind (MOUSEPAD_GSETTINGS,
- key,
- object,
- property,
- G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (key, object, property, G_SETTINGS_BIND_DEFAULT);
signal_name = g_strdup_printf (changed::%s, key);
@@ -324,11 +320,11 @@ mousepad_replace_dialog_response (GtkWidget *widget,
gboolean match_case, match_whole_word, replace_all;
/* read the search settings */
- search_direction = g_settings_get_int (MOUSEPAD_GSETTINGS,
search-direction);
- replace_all_location = g_settings_get_int (MOUSEPAD_GSETTINGS,
search-replace-all-location);
- match_case = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
search-match-case);
- match_whole_word = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
search-match-whole-word);
- replace_all = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
search-replace-all);
+ search_direction = mousepad_settings_get_int (search-direction);
+ replace_all_location = mousepad_settings_get_int
(search-replace-all-location);
+ match_case = mousepad_settings_get_boolean (search-match-case);
+ match_whole_word = mousepad_settings_get_boolean (search-match-whole-word);
+ replace_all = mousepad_settings_get_boolean (search-replace-all);
/* close dialog */
if (response_id == MOUSEPAD_RESPONSE_CLOSE)
@@ -450,7 +446,7 @@ mousepad_replace_dialog_changed (MousepadReplaceDialog
*dialog)
gboolean sensitive;
gboolean replace_all;
- replace_all = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
search-replace-all);
+ replace_all = mousepad_settings_get_boolean (search-replace-all);
/* set the sensitivity of some dialog widgets */
gtk_widget_set_sensitive (dialog-search_location_combo, replace_all);
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index cea04ae..f01d36d 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -160,7 +160,7 @@ mousepad_search_bar_init (MousepadSearchBar *bar)
gboolean match_case;
/* load some preferences */
- match_case = g_settings_get_boolean (MOUSEPAD_GSETTINGS,
search-match-case);
+ match_case = mousepad_settings_get_boolean (search-match-case);
/* init variables */
bar-highlight_id = 0;
@@ -240,11 +240,7 @@ mousepad_search_bar_init (MousepadSearchBar *bar)
gtk_widget_show (check);
/* keep the
[Xfce4-commits] [apps/mousepad] 38/45: Rename org.xfce.Mousepad.gschema.xml to use lower-case
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 68eaea8728947fae3938fc2afddabaf5d8b0f461 Author: Matthew Brush mbr...@codebrainz.ca Date: Thu Jul 10 15:12:46 2014 -0700 Rename org.xfce.Mousepad.gschema.xml to use lower-case To match the schema ids used in the file. --- mousepad/Makefile.am |4 ++-- ...org.xfce.Mousepad.gschema.xml = org.xfce.mousepad.gschema.xml} |0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am index fc97c2b..bb1f36a 100644 --- a/mousepad/Makefile.am +++ b/mousepad/Makefile.am @@ -131,9 +131,9 @@ EXTRA_DIST = \ mousepad-marshal.list \ mousepad-window-ui.xml \ mousepad-prefs-dialog.glade \ - org.xfce.Mousepad.gschema.xml + org.xfce.mousepad.gschema.xml -gsettings_SCHEMAS = org.xfce.Mousepad.gschema.xml +gsettings_SCHEMAS = org.xfce.mousepad.gschema.xml @GSETTINGS_RULES@ # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/mousepad/org.xfce.Mousepad.gschema.xml b/mousepad/org.xfce.mousepad.gschema.xml similarity index 100% rename from mousepad/org.xfce.Mousepad.gschema.xml rename to mousepad/org.xfce.mousepad.gschema.xml -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 09/45: Use existing config directory for GSettings keyfile backend
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 011a2e8d8019d2b5deffac71726c47afeac56b5d
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 16:02:43 2014 -0700
Use existing config directory for GSettings keyfile backend
Also add scope/block to avoid C89 warning about mixing code and
declarations.
---
mousepad/mousepad-settings.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index 64035e4..d80bf9e 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -127,17 +127,19 @@ mousepad_settings_get_default (void)
mousepad_settings_update_gsettings_schema_dir ();
#ifndef MOUSEPAD_GSETTINGS_USE_DBUS
+{
gchar *conf_file;
/* Path inside user's config directory */
conf_file = g_build_filename (g_get_user_config_dir (),
-mousepad,
+Mousepad,
settings.conf,
NULL);
/* Always use the keyfile backend */
backend = g_keyfile_settings_backend_new (conf_file, /, NULL);
g_free (conf_file);
+}
#else
backend = g_settings_backend_get_default ();
#endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 45/45: Merge branch 'preferences-menu-toolbar'
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 3b084a5adb50fae1cb42c19528d841d80af4d661 Merge: 5e95b16 d23ccc4 Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 03:57:29 2014 -0700 Merge branch 'preferences-menu-toolbar' This merge contains tons of improvements including: * Add preferences dialog. * Port to GSettings with compile-time option to force keyfile backend. * Add a toolbar with various related preferences. * Re-organize the main menu item grouping. * Add tons of GtkSourceView preferences which provides much more control over the editor widget's behaviour and appearance. * Add fullscreen support .gitignore |3 + Makefile.am|2 + README |3 +- autogen.sh |2 + configure.ac.in| 22 +- mousepad/Makefile.am | 33 +- mousepad/mousepad-application.c| 63 +- mousepad/mousepad-application.h|3 + mousepad/mousepad-document.c | 91 +-- mousepad/mousepad-document.h |6 - mousepad/mousepad-encoding-dialog.c|5 +- mousepad/mousepad-preferences.c| 652 mousepad/mousepad-preferences.h| 38 -- mousepad/mousepad-prefs-dialog.c | 569 + mousepad/mousepad-prefs-dialog.glade | 946 mousepad/mousepad-prefs-dialog.h | 24 + mousepad/mousepad-print.c |1 - mousepad/mousepad-private.h|1 + mousepad/mousepad-replace-dialog.c | 229 +++ mousepad/mousepad-search-bar.c | 47 +- mousepad/mousepad-settings-store.c | 279 + mousepad/mousepad-settings-store.h | 38 ++ mousepad/mousepad-settings.c | 288 + mousepad/mousepad-settings.h | 122 mousepad/mousepad-view.c | 526 ++-- mousepad/mousepad-view.h | 37 +- mousepad/mousepad-window-ui.xml| 104 +++- mousepad/mousepad-window.c | 1055 ++-- mousepad/mousepad-window.h |2 + mousepad/org.xfce.mousepad.gschema.xml | 335 ++ 30 files changed, 3948 insertions(+), 1578 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 14/45: Make font-name a real property on MousepadView
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 172ddea0e58370869d5901665fefd0f1d18a2f13
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 18:40:53 2014 -0700
Make font-name a real property on MousepadView
Use normal GSettings binding to keep in sync with settings.
---
mousepad/mousepad-view.c | 174 --
mousepad/mousepad-view.h |2 +
2 files changed, 123 insertions(+), 53 deletions(-)
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 80ed437..1956c82 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -31,11 +31,20 @@
+#define MOUSEPAD_VIEW_DEFAULT_FONT Monospace
#define mousepad_view_get_buffer(view) (gtk_text_view_get_buffer
(GTK_TEXT_VIEW (view)))
static void mousepad_view_finalize (GObject
*object);
+static void mousepad_view_set_property (GObject
*object,
+ guint
prop_id,
+ const GValue
*value,
+ GParamSpec
*pspec);
+static void mousepad_view_get_property (GObject
*object,
+ guint
prop_id,
+ GValue
*value,
+ GParamSpec
*pspec);
static void mousepad_view_style_set (GtkWidget
*widget,
GtkStyle
*previous_style);
static gint mousepad_view_expose(GtkWidget
*widget,
@@ -112,6 +121,18 @@ struct _MousepadView
/* if the selection is in editing mode */
guint selection_editing : 1;
+
+ /* the font used in the view */
+ gchar *font_name;
+};
+
+
+
+enum
+{
+ PROP_0,
+ PROP_FONT_NAME,
+ NUM_PROPERTIES
};
@@ -128,6 +149,8 @@ mousepad_view_class_init (MousepadViewClass *klass)
gobject_class = G_OBJECT_CLASS (klass);
gobject_class-finalize = mousepad_view_finalize;
+ gobject_class-set_property = mousepad_view_set_property;
+ gobject_class-get_property = mousepad_view_get_property;
widget_class = GTK_WIDGET_CLASS (klass);
widget_class-expose_event = mousepad_view_expose;
@@ -135,47 +158,15 @@ mousepad_view_class_init (MousepadViewClass *klass)
widget_class-key_press_event = mousepad_view_key_press_event;
widget_class-button_press_event = mousepad_view_button_press_event;
widget_class-button_release_event = mousepad_view_button_release_event;
-}
-
-
-
-void
-mousepad_view_set_font_name (MousepadView *view,
- const gchar *font_name)
-{
- PangoFontDescription *font_desc;
-
- g_return_if_fail (MOUSEPAD_IS_VIEW (view));
-
- if (font_name == NULL)
-font_name = Monospace;
-
- font_desc = pango_font_description_from_string (font_name);
- if (G_LIKELY (font_desc != NULL))
-{
-#if GTK_CHECK_VERSION(3, 0, 0)
- gtk_widget_override_font (GTK_WIDGET (view), font_desc);
-#else
- gtk_widget_modify_font (GTK_WIDGET (view), font_desc);
-#endif
- pango_font_description_free (font_desc);
-}
- else
-g_critical (Invalid font-name given: %s, font_name);
-}
-
-
-
-/* when the view-font-name setting changes, update the view to use that font */
-static void
-mousepad_view_font_name_setting_changed (MousepadView *view,
- gchar*key,
- MousepadSettings *settings)
-{
- gchar *font_name = mousepad_settings_get_string (view-font-name);
- mousepad_view_set_font_name (view, font_name);
- g_free (font_name);
+ g_object_class_install_property (
+gobject_class,
+PROP_FONT_NAME,
+g_param_spec_string (font-name,
+ FontName,
+ The name of the font to use in the view,
+ MOUSEPAD_VIEW_DEFAULT_FONT,
+ G_PARAM_READWRITE));
}
@@ -183,8 +174,6 @@ mousepad_view_font_name_setting_changed (MousepadView
*view,
static void
mousepad_view_init (MousepadView *view)
{
- gchar *font_name;
-
/* initialize selection variables */
view-selection_timeout_id = 0;
view-selection_tag = NULL;
@@ -202,17 +191,7 @@ mousepad_view_init (MousepadView *view)
/* bind Gsettings */
mousepad_settings_bind (view-line-numbers, view, show-line-numbers,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-auto-indent, view, auto-indent,
G_SETTINGS_BIND_DEFAULT);
-
- /* Set the initial font-name */
-
[Xfce4-commits] [apps/mousepad] 27/45: Fix color-scheme property so setting saves correctly
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 5ee27d2a8a69df0fb445e0489b9072a1fa0a547e
Author: Matthew Brush mbr...@codebrainz.ca
Date: Mon Jul 7 17:45:17 2014 -0700
Fix color-scheme property so setting saves correctly
And remove G_PARAM_CONSTRUCT from other properties where not needed.
---
mousepad/mousepad-view.c | 72 +++---
1 file changed, 43 insertions(+), 29 deletions(-)
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 244f7a1..659302a 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -128,6 +128,8 @@ struct _MousepadView
/* whitespace visualization */
gbooleanshow_whitespace;
gbooleanshow_line_endings;
+
+ gchar *color_scheme;
};
@@ -183,7 +185,7 @@ mousepad_view_class_init (MousepadViewClass *klass)
ShowWhitespace,
Whether whitespace is visualized in the view,
FALSE,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
g_object_class_install_property (
gobject_class,
@@ -192,7 +194,7 @@ mousepad_view_class_init (MousepadViewClass *klass)
ShowLineEndings,
Whether line-endings are visualized in the view,
FALSE,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
g_object_class_install_property (
gobject_class,
@@ -201,7 +203,7 @@ mousepad_view_class_init (MousepadViewClass *klass)
ColorScheme,
The id of the syntax highlighting color scheme to
use,
NULL,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
g_object_class_install_property (
gobject_class,
@@ -210,12 +212,32 @@ mousepad_view_class_init (MousepadViewClass *klass)
WordWrap,
Whether to virtually wrap long lines in the view,
FALSE,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
}
static void
+mousepad_view_buffer_changed (MousepadView *view,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GtkSourceBuffer *buffer;
+
+ buffer = (GtkSourceBuffer*) gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ if (GTK_IS_SOURCE_BUFFER (buffer))
+{
+ GtkSourceStyleSchemeManager *manager;
+ GtkSourceStyleScheme*scheme;
+
+ manager = gtk_source_style_scheme_manager_get_default ();
+ scheme = gtk_source_style_scheme_manager_get_scheme (manager,
view-color_scheme);
+ gtk_source_buffer_set_style_scheme (buffer, scheme);
+}
+}
+
+
+static void
mousepad_view_init (MousepadView *view)
{
/* initialize selection variables */
@@ -224,6 +246,13 @@ mousepad_view_init (MousepadView *view)
view-selection_marks = NULL;
view-selection_length = 0;
view-selection_editing = FALSE;
+ view-color_scheme = g_strdup (none);
+
+ /* make sure any buffers set on the view get the color scheme applied to
them */
+ g_signal_connect (view,
+notify::buffer,
+G_CALLBACK (mousepad_view_buffer_changed),
+NULL);
/* reset drag coordinates */
view-selection_start_x = view-selection_end_x = -1;
@@ -273,6 +302,9 @@ mousepad_view_finalize (GObject *object)
if (G_UNLIKELY (view-selection_marks != NULL))
g_slist_free (view-selection_marks);
+ /* cleanup color scheme name */
+ g_free (view-color_scheme);
+
(*G_OBJECT_CLASS (mousepad_view_parent_class)-finalize) (object);
}
@@ -2603,25 +2635,16 @@ void
mousepad_view_set_color_scheme (MousepadView *view,
const gchar *color_scheme)
{
- GtkSourceBuffer *buffer;
- GtkSourceStyleScheme *scheme;
g_return_if_fail (MOUSEPAD_IS_VIEW (view));
- if (color_scheme == NULL || g_strcmp0 (color_scheme, none) == 0)
-scheme = NULL;
- else
+ if (g_strcmp0 (color_scheme, view-color_scheme) != 0)
{
- GtkSourceStyleSchemeManager *manager;
- manager = gtk_source_style_scheme_manager_get_default ();
- scheme = gtk_source_style_scheme_manager_get_scheme (manager,
color_scheme);
- g_warn_if_fail (scheme != NULL);
-}
+ g_free (view-color_scheme);
+ view-color_scheme = g_strdup (color_scheme);
+
+ /* update the buffer if there is one */
+ mousepad_view_buffer_changed (view, NULL, NULL);
- buffer = (GtkSourceBuffer*) gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- if (GTK_IS_SOURCE_BUFFER (buffer))
-{
[Xfce4-commits] [apps/mousepad] 21/45: Update the window title when path-in-title setting changes
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 442432667d7b83ea8ec584f45024f2a274f9fb88
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 22:58:30 2014 -0700
Update the window title when path-in-title setting changes
---
mousepad/mousepad-window.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 1564903..9a0e839 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -552,6 +552,17 @@ mousepad_window_update_statusbar_settings (MousepadWindow
*window,
+/* Called in response to any setting changed which affects the window title. */
+static void
+mousepad_window_update_window_title (MousepadWindow *window,
+ gchar*key,
+ MousepadSettings *settings)
+{
+ mousepad_window_set_title (window);
+}
+
+
+
static void
mousepad_window_init (MousepadWindow *window)
{
@@ -716,6 +727,12 @@ mousepad_window_init (MousepadWindow *window)
changed::view-insert-spaces,
G_CALLBACK
(mousepad_window_update_statusbar_settings),
window);
+
+ /* update the window title when 'path-in-title' setting changes */
+ g_signal_connect_swapped (MOUSEPAD_GSETTINGS,
+changed::window-path-in-title,
+G_CALLBACK (mousepad_window_update_window_title),
+window);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 35/45: Remove mutex locking around global settings object
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 1c4dcd9b117d0cefb6c18fda02311a056e9481a7
Author: Matthew Brush mbr...@codebrainz.ca
Date: Thu Jul 10 12:19:55 2014 -0700
Remove mutex locking around global settings object
Not using threads at this point anyway and using it at this level
causes deadlocks when functions watching for settings changes call
back in to get/set the settings. In the future if threads are used,
access to the global settings instance should be locked by the caller
or some other mechanism put in places.
---
mousepad/mousepad-settings.c | 39 +++
1 file changed, 3 insertions(+), 36 deletions(-)
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index 38d1034..d5643e9 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -6,12 +6,6 @@
-G_LOCK_DEFINE (settings_lock);
-#define MOUSEPAD_SETTINGS_LOCK() G_LOCK (settings_lock)
-#define MOUSEPAD_SETTINGS_UNLOCK() G_UNLOCK (settings_lock)
-
-
-
static MousepadSettingsStore *settings_store = NULL;
static gint settings_init_count = 0;
@@ -20,18 +14,11 @@ static gint settings_init_count = 0;
void
mousepad_settings_finalize (void)
{
- MOUSEPAD_SETTINGS_LOCK ();
-
g_settings_sync ();
settings_init_count--;
if (settings_init_count 0)
-{
- MOUSEPAD_SETTINGS_UNLOCK ();
- return;
-}
-
- MOUSEPAD_SETTINGS_UNLOCK ();
+return;
if (MOUSEPAD_IS_SETTINGS_STORE (settings_store))
{
@@ -46,8 +33,6 @@ void
mousepad_settings_init (void)
{
- MOUSEPAD_SETTINGS_LOCK ();
-
if (settings_init_count == 0)
{
if (! MOUSEPAD_IS_SETTINGS_STORE (settings_store))
@@ -55,8 +40,6 @@ mousepad_settings_init (void)
}
settings_init_count++;
-
- MOUSEPAD_SETTINGS_UNLOCK ();
}
@@ -77,9 +60,7 @@ mousepad_setting_bind (const gchar *path,
if (mousepad_settings_store_lookup (settings_store, path, key_name,
settings))
{
- MOUSEPAD_SETTINGS_LOCK ();
g_settings_bind (settings, key_name, object, prop, flags);
- MOUSEPAD_SETTINGS_UNLOCK ();
return TRUE;
}
@@ -107,14 +88,12 @@ mousepad_setting_connect (const gchar *path,
signal_name = g_strdup_printf (changed::%s, key_name);
- MOUSEPAD_SETTINGS_LOCK ();
signal_id = g_signal_connect_data (settings,
signal_name,
callback,
user_data,
NULL,
connect_flags);
- MOUSEPAD_SETTINGS_UNLOCK ();
g_free (signal_name);
}
@@ -160,9 +139,7 @@ mousepad_setting_get (const gchar *path,
GVariant *variant;
va_list ap;
- MOUSEPAD_SETTINGS_LOCK ();
variant = g_settings_get_value (settings, key_name);
- MOUSEPAD_SETTINGS_UNLOCK ();
g_variant_ref_sink (variant);
@@ -203,9 +180,7 @@ mousepad_setting_set (const gchar *path,
g_variant_ref_sink (variant);
- MOUSEPAD_SETTINGS_LOCK ();
g_settings_set_value (settings, key_name, variant);
- MOUSEPAD_SETTINGS_UNLOCK ();
g_variant_unref (variant);
@@ -288,11 +263,7 @@ mousepad_setting_get_enum (const gchar *path)
g_return_val_if_fail (path != NULL, FALSE);
if (mousepad_settings_store_lookup (settings_store, path, key_name,
settings))
-{
- MOUSEPAD_SETTINGS_LOCK ();
- result = g_settings_get_enum (settings, key_name);
- MOUSEPAD_SETTINGS_UNLOCK ();
-}
+result = g_settings_get_enum (settings, key_name);
else
g_warn_if_reached ();
@@ -311,11 +282,7 @@ mousepad_setting_set_enum (const gchar *path,
g_return_val_if_fail (path != NULL, FALSE);
if (mousepad_settings_store_lookup (settings_store, path, key_name,
settings))
-{
- MOUSEPAD_SETTINGS_LOCK ();
- g_settings_set_enum (settings, key_name, value);
- MOUSEPAD_SETTINGS_UNLOCK ();
-}
+g_settings_set_enum (settings, key_name, value);
else
g_warn_if_reached ();
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 17/45: Add color-scheme property to MousepadView
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 81a430c0ff61a50cf47cbcd1b3de49acf7f72b64
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 21:38:30 2014 -0700
Add color-scheme property to MousepadView
Bind GSettings to property to keep in sync.
---
mousepad/mousepad-view.c | 65
mousepad/mousepad-view.h |5
mousepad/mousepad-window.c | 17
3 files changed, 70 insertions(+), 17 deletions(-)
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index cddb68c..33b041d 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -138,6 +138,7 @@ enum
PROP_FONT_NAME,
PROP_SHOW_WHITESPACE,
PROP_SHOW_LINE_ENDINGS,
+ PROP_COLOR_SCHEME,
NUM_PROPERTIES
};
@@ -191,6 +192,15 @@ mousepad_view_class_init (MousepadViewClass *klass)
Whether line-endings are visualized in the view,
FALSE,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+gobject_class,
+PROP_COLOR_SCHEME,
+g_param_spec_string (color-scheme,
+ ColorScheme,
+ The id of the syntax highlighting color scheme to
use,
+ NULL,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
}
@@ -227,6 +237,7 @@ mousepad_view_init (MousepadView *view)
mousepad_settings_bind (view-show-right-margin, view, show-right-margin,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-smart-home-end, view, smart-home-end,
G_SETTINGS_BIND_DEFAULT);
mousepad_settings_bind (view-tab-width, view, tab-width,
G_SETTINGS_BIND_DEFAULT);
+ mousepad_settings_bind (view-color-scheme, view, color-scheme,
G_SETTINGS_BIND_DEFAULT);
}
@@ -268,6 +279,9 @@ mousepad_view_set_property (GObject *object,
case PROP_SHOW_LINE_ENDINGS:
mousepad_view_set_show_line_endings (view, g_value_get_boolean (value));
break;
+case PROP_COLOR_SCHEME:
+ mousepad_view_set_color_scheme (view, g_value_get_string (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -295,6 +309,9 @@ mousepad_view_get_property (GObject*object,
case PROP_SHOW_LINE_ENDINGS:
g_value_set_boolean (value, mousepad_view_get_show_line_endings (view));
break;
+case PROP_COLOR_SCHEME:
+ g_value_set_string (value, mousepad_view_get_color_scheme (view));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2555,3 +2572,51 @@ mousepad_view_get_show_line_endings (MousepadView *view)
return view-show_line_endings;
}
+
+
+
+void
+mousepad_view_set_color_scheme (MousepadView *view,
+const gchar *color_scheme)
+{
+ GtkSourceBuffer *buffer;
+ GtkSourceStyleScheme *scheme;
+ g_return_if_fail (MOUSEPAD_IS_VIEW (view));
+
+ if (color_scheme == NULL || g_strcmp0 (color_scheme, none) == 0)
+scheme = NULL;
+ else
+{
+ GtkSourceStyleSchemeManager *manager;
+ manager = gtk_source_style_scheme_manager_get_default ();
+ scheme = gtk_source_style_scheme_manager_get_scheme (manager,
color_scheme);
+ g_warn_if_fail (scheme != NULL);
+}
+
+ buffer = (GtkSourceBuffer*) gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ if (GTK_IS_SOURCE_BUFFER (buffer))
+{
+ gtk_source_buffer_set_style_scheme (buffer, scheme);
+ gtk_source_buffer_set_highlight_syntax (buffer, (scheme != NULL));
+ g_object_notify (G_OBJECT (view), color-scheme);
+}
+}
+
+
+
+const gchar *
+mousepad_view_get_color_scheme (MousepadView *view)
+{
+ GtkSourceBuffer *buffer;
+ GtkSourceStyleScheme *scheme;
+
+ g_return_val_if_fail (MOUSEPAD_IS_VIEW (view), NULL);
+
+ buffer = (GtkSourceBuffer*) gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+ scheme = gtk_source_buffer_get_style_scheme (buffer);
+ if (GTK_IS_SOURCE_STYLE_SCHEME (scheme))
+return gtk_source_style_scheme_get_id (scheme);
+
+ return none;
+}
diff --git a/mousepad/mousepad-view.h b/mousepad/mousepad-view.h
index df123a7..f2bf88f 100644
--- a/mousepad/mousepad-view.h
+++ b/mousepad/mousepad-view.h
@@ -110,6 +110,11 @@ voidmousepad_view_set_show_line_endings
(MousepadView *view
gbooleanmousepad_view_get_show_line_endings (MousepadView
*view);
+voidmousepad_view_set_color_scheme (MousepadView
*view,
+ const gchar
*color_scheme);
+
+const gchar*mousepad_view_get_color_scheme (MousepadView
*view);
+
G_END_DECLS
#endif /* !__MOUSEPAD_VIEW_H__ */
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index
[Xfce4-commits] [apps/mousepad] 20/45: Always create a statusbar and just hide/show it
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 70761ead98a06d2383cf95b2f43961f6dd1d5ee9
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 22:44:07 2014 -0700
Always create a statusbar and just hide/show it
Make the action handler hide/show the statusbar and bind the related
GSetting to the action.
---
mousepad/mousepad-window.c | 82 +++-
1 file changed, 35 insertions(+), 47 deletions(-)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 5ce17b9..1564903 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -100,6 +100,7 @@ static void mousepad_window_set_title
(MousepadW
static void mousepad_window_populate_statusbar_popup
(MousepadWindow *window,
GtkMenu
*menu,
MousepadStatusbar *statusbar);
+static void mousepad_window_create_statusbar
(MousepadWindow *window);
static void mousepad_window_statusbar_filetype_toggled
(GtkCheckMenuItem *item,
MousepadWindow *window);
@@ -560,9 +561,7 @@ mousepad_window_init (MousepadWindow *window)
GtkWidget *separator;
GtkWidget *ebox;
GtkWidget *item;
- GtkAction *action;
gint width, height;
- gboolean statusbar_visible;
/* initialize stuff */
window-save_geometry_timer_id = 0;
@@ -595,7 +594,6 @@ mousepad_window_init (MousepadWindow *window)
/* read settings from the preferences */
width = mousepad_settings_get_int (window-width);
height = mousepad_settings_get_int (window-height);
- statusbar_visible = mousepad_settings_get_boolean
(window-statusbar-visible);
/* set the default window size */
gtk_window_set_default_size (GTK_WINDOW (window), width, height);
@@ -702,9 +700,8 @@ mousepad_window_init (MousepadWindow *window)
gtk_box_pack_start (GTK_BOX (window-box), window-notebook, TRUE, TRUE,
PADDING);
gtk_widget_show (window-notebook);
- /* check if we should display the statusbar by default */
- action = gtk_action_group_get_action (window-action_group, statusbar);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), statusbar_visible);
+ /* create the statusbar */
+ mousepad_window_create_statusbar (window);
/* allow drops in the window */
gtk_drag_dest_set (GTK_WIDGET (window), GTK_DEST_DEFAULT_MOTION |
GTK_DEST_DEFAULT_DROP, drop_targets, G_N_ELEMENTS (drop_targets),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
@@ -3427,6 +3424,36 @@ mousepad_window_menu_languages (MousepadWindow *window)
+static void
+mousepad_window_create_statusbar (MousepadWindow *window)
+{
+ GtkAction *action;
+
+ /* setup a new statusbar */
+ window-statusbar = mousepad_statusbar_new ();
+
+ /* bind the GSetting to the GtkAction that controls the statusbar */
+ action = gtk_action_group_get_action (window-action_group, statusbar);
+ mousepad_settings_bind (window-statusbar-visible, action, active,
G_SETTINGS_BIND_DEFAULT);
+
+ /* pack the statusbar into the window UI */
+ gtk_box_pack_end (GTK_BOX (window-box), window-statusbar, FALSE, FALSE, 0);
+
+ /* overwrite toggle signal */
+ g_signal_connect_swapped (G_OBJECT (window-statusbar), enable-overwrite,
+G_CALLBACK
(mousepad_window_action_statusbar_overwrite), window);
+
+ /* populate filetype popup menu signal */
+ g_signal_connect_swapped (G_OBJECT (window-statusbar),
populate-filetype-popup,
+G_CALLBACK
(mousepad_window_populate_statusbar_popup), window);
+
+ /* update the statusbar items */
+ if (MOUSEPAD_IS_DOCUMENT (window-active))
+mousepad_document_send_signals (window-active);
+}
+
+
+
/**
* Menu Actions
*
@@ -4542,47 +4569,8 @@ mousepad_window_action_statusbar (GtkToggleAction
*action,
/* whether we show the statusbar */
show_statusbar = gtk_toggle_action_get_active (action);
- /* check if we should drop the statusbar */
- if (!show_statusbar window-statusbar != NULL)
-{
- /* destroy the statusbar */
- gtk_widget_destroy (window-statusbar);
- window-statusbar = NULL;
-}
- else if (show_statusbar window-statusbar == NULL)
-{
- /* setup a new statusbar */
- window-statusbar = mousepad_statusbar_new ();
-
- mousepad_settings_bind (window-statusbar-visible,
- window-statusbar,
- visible,
- G_SETTINGS_BIND_DEFAULT);
-
- gtk_box_pack_end (GTK_BOX (window-box), window-statusbar, FALSE,
FALSE, 0);
- gtk_widget_show (window-statusbar);
[Xfce4-commits] [apps/mousepad] 41/45: Implement match-braces setting
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 87f2d0636b4028cf38cf469e9add41d5299e3f1d Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 00:34:59 2014 -0700 Implement match-braces setting --- mousepad/mousepad-prefs-dialog.c |3 +- mousepad/mousepad-prefs-dialog.glade |3 +- mousepad/mousepad-settings.h |1 + mousepad/mousepad-view.c | 47 mousepad/mousepad-view.h |5 mousepad/org.xfce.mousepad.gschema.xml |8 ++ 6 files changed, 64 insertions(+), 3 deletions(-) diff --git a/mousepad/mousepad-prefs-dialog.c b/mousepad/mousepad-prefs-dialog.c index 353df21..47b6fd2 100644 --- a/mousepad/mousepad-prefs-dialog.c +++ b/mousepad/mousepad-prefs-dialog.c @@ -14,7 +14,7 @@ #define WID_SHOW_RIGHT_MARGIN_CHECK /prefs/view/display/long-line-check #define WID_RIGHT_MARGIN_SPIN /prefs/view/display/long-line-spin #define WID_HIGHLIGHT_CURRENT_LINE_CHECK /prefs/view/display/highlight-current-line-check -#define WID_HIGHLIGHT_MATCHING_BRACES_CHECK /prefs/view/display/highlight-braces-check +#define WID_MATCH_BRACES_CHECK /prefs/view/display/match-braces-check #define WID_WORD_WRAP_CHECK /prefs/view/display/word-wrap-check #define WID_USE_DEFAULT_FONT_CHECK /prefs/view/font/default-check @@ -354,6 +354,7 @@ mousepad_prefs_dialog_init (MousepadPrefsDialog *self) BIND_CHECKBOX (HIGHLIGHT_CURRENT_LINE); BIND_CHECKBOX (WORD_WRAP); BIND_CHECKBOX (USE_DEFAULT_FONT); + BIND_CHECKBOX (MATCH_BRACES); /* Editor */ BIND_CHECKBOX (AUTO_INDENT); diff --git a/mousepad/mousepad-prefs-dialog.glade b/mousepad/mousepad-prefs-dialog.glade index ce99499..ff6dd8c 100644 --- a/mousepad/mousepad-prefs-dialog.glade +++ b/mousepad/mousepad-prefs-dialog.glade @@ -200,12 +200,11 @@ /packing /child child - object class=GtkCheckButton id=/prefs/view/display/highlight-braces-check + object class=GtkCheckButton id=/prefs/view/display/match-braces-check property name=label translatable=yesHighlight matching brackets/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h index b5bf091..3acf2c7 100644 --- a/mousepad/mousepad-settings.h +++ b/mousepad/mousepad-settings.h @@ -23,6 +23,7 @@ G_BEGIN_DECLS #define MOUSEPAD_SETTING_SMART_HOME_END /preferences/view/smart-home-end #define MOUSEPAD_SETTING_TAB_WIDTH /preferences/view/tab-width #define MOUSEPAD_SETTING_WORD_WRAP /preferences/view/word-wrap +#define MOUSEPAD_SETTING_MATCH_BRACES /preferences/view/match-braces #define MOUSEPAD_SETTING_COLOR_SCHEME /preferences/view/color-scheme #define MOUSEPAD_SETTING_TOOLBAR_VISIBLE /preferences/window/toolbar-visible #define MOUSEPAD_SETTING_STATUSBAR_VISIBLE /preferences/window/statusbar-visible diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c index 7f0bd91..1bc35f7 100644 --- a/mousepad/mousepad-view.c +++ b/mousepad/mousepad-view.c @@ -133,6 +133,8 @@ struct _MousepadView gboolean show_line_endings; gchar*color_scheme; + + gboolean match_braces; }; @@ -145,6 +147,7 @@ enum PROP_SHOW_LINE_ENDINGS, PROP_COLOR_SCHEME, PROP_WORD_WRAP, + PROP_MATCH_BRACES, NUM_PROPERTIES }; @@ -216,6 +219,15 @@ mousepad_view_class_init (MousepadViewClass *klass) Whether to virtually wrap long lines in the view, FALSE, G_PARAM_READWRITE)); + + g_object_class_install_property ( +gobject_class, +PROP_MATCH_BRACES, +g_param_spec_boolean (match-braces, + MatchBraces, + Whether to highlight matching braces, parens, brackets, etc., + FALSE, + G_PARAM_READWRITE)); } @@ -236,6 +248,8 @@ mousepad_view_buffer_changed (MousepadView *view, manager = gtk_source_style_scheme_manager_get_default (); scheme = gtk_source_style_scheme_manager_get_scheme (manager, view-color_scheme); gtk_source_buffer_set_style_scheme (buffer, scheme); + + gtk_source_buffer_set_highlight_matching_brackets (buffer, view-match_braces); } } @@ -264,6
[Xfce4-commits] [apps/mousepad] 42/45: Improve toolbar preferences
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 3321a67c255d91120ec7ddd96bcb48f66c117a52
Author: Matthew Brush mbr...@codebrainz.ca
Date: Fri Jul 11 02:12:07 2014 -0700
Improve toolbar preferences
---
mousepad/mousepad-prefs-dialog.c | 146 -
mousepad/mousepad-prefs-dialog.glade | 183 +++-
mousepad/mousepad-settings.h |2 +
mousepad/mousepad-window.c | 44 ++--
mousepad/org.xfce.mousepad.gschema.xml | 31 ++
5 files changed, 397 insertions(+), 9 deletions(-)
diff --git a/mousepad/mousepad-prefs-dialog.c b/mousepad/mousepad-prefs-dialog.c
index 47b6fd2..8ea7a10 100644
--- a/mousepad/mousepad-prefs-dialog.c
+++ b/mousepad/mousepad-prefs-dialog.c
@@ -34,6 +34,11 @@
#define WID_REMEMBER_GEOMETRY_CHECK
/prefs/window/general/remember-window-size-check
#define WID_ALWAYS_SHOW_TABS_CHECK
/prefs/window/notebook/always-show-tabs-check
#define WID_CYCLE_TABS_CHECK
/prefs/window/notebook/cycle-tabs-check
+#define WID_TOOLBAR_VISIBLE_CHECK
/prefs/window/toolbar/visible-check
+#define WID_TOOLBAR_STYLE_COMBO /prefs/window/toolbar/style-combo
+#define WID_TOOLBAR_STYLE_LABEL /prefs/window/toolbar/style-label
+#define WID_TOOLBAR_ICON_SIZE_COMBO
/prefs/window/toolbar/icon-size-combo
+#define WID_TOOLBAR_ICON_SIZE_LABEL
/prefs/window/toolbar/icon-size-label
@@ -53,6 +58,8 @@ struct MousepadPrefsDialog_
gulong color_scheme_signal;
gulong tab_mode_signal;
gulong home_end_signal;
+ gulong toolbar_style_signal;
+ gulong toolbar_icon_size_signal;
};
struct MousepadPrefsDialogClass_
@@ -98,6 +105,10 @@ mousepad_prefs_dialog_finalize (GObject *object)
MOUSEPAD_SETTING_DISCONNECT (INSERT_SPACES, self-tab_mode_signal);
if (self-home_end_signal 0)
MOUSEPAD_SETTING_DISCONNECT (SMART_HOME_END, self-home_end_signal);
+ if (self-toolbar_style_signal 0)
+MOUSEPAD_SETTING_DISCONNECT (TOOLBAR_STYLE, self-toolbar_style_signal);
+ if (self-toolbar_icon_size_signal 0)
+MOUSEPAD_SETTING_DISCONNECT (TOOLBAR_ICON_SIZE,
self-toolbar_icon_size_signal);
/* destroy the GtkBuilder instance */
if (G_IS_OBJECT (self-builder))
@@ -289,6 +300,97 @@ mousepad_prefs_dialog_home_end_setting_changed
(MousepadPrefsDialog *self,
+/* update toolbar style setting when combo changes */
+static void
+mousepad_prefs_dialog_toolbar_style_changed (MousepadPrefsDialog *self,
+ GtkComboBox *combo)
+{
+ self-blocked = TRUE;
+ MOUSEPAD_SETTING_SET_ENUM (TOOLBAR_STYLE, gtk_combo_box_get_active (combo));
+ self-blocked = FALSE;
+}
+
+
+
+/* update the combo when the setting changes */
+static void
+mousepad_prefs_dialog_toolbar_style_setting_changed (MousepadPrefsDialog *self,
+ gchar *key,
+ GSettings
*settings)
+{
+ GtkComboBox *combo;
+
+ /* don't do anything when the combo box is itself updating the setting */
+ if (self-blocked)
+return;
+
+ combo = GTK_COMBO_BOX (gtk_builder_get_object (self-builder,
WID_TOOLBAR_STYLE_COMBO));
+
+ gtk_combo_box_set_active (combo, MOUSEPAD_SETTING_GET_ENUM (TOOLBAR_STYLE));
+}
+
+
+
+/* update toolbar icon size setting when combo changes */
+static void
+mousepad_prefs_dialog_toolbar_icon_size_changed (MousepadPrefsDialog *self,
+ GtkComboBox *combo)
+{
+ GtkTreeIter iter;
+
+ if (gtk_combo_box_get_active_iter (combo, iter))
+{
+ GtkTreeModel *model;
+ gint icon_size = 0;
+
+ model = gtk_combo_box_get_model (combo);
+
+ gtk_tree_model_get (model, iter, 0, icon_size, -1);
+
+ self-blocked = TRUE;
+ MOUSEPAD_SETTING_SET_ENUM (TOOLBAR_ICON_SIZE, icon_size);
+ self-blocked = FALSE;
+}
+}
+
+
+
+/* update the combo when the setting changes */
+static void
+mousepad_prefs_dialog_toolbar_icon_size_setting_changed (MousepadPrefsDialog
*self,
+ gchar
*key,
+ GSettings
*settings)
+{
+ GtkComboBox *combo;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gint icon_size;
+ gboolean valid;
+
+ /* don't do anything when the combo box is itself updating the setting */
+ if (self-blocked)
+return;
+
+ icon_size = MOUSEPAD_SETTING_GET_ENUM (TOOLBAR_ICON_SIZE);
+ combo = GTK_COMBO_BOX (gtk_builder_get_object (self-builder,
WID_TOOLBAR_ICON_SIZE_COMBO));
+ model = gtk_combo_box_get_model (combo);
+ valid = gtk_tree_model_get_iter_first (model, iter);
+
+ while (valid)
+{
+ gint size = 0;
+
[Xfce4-commits] [apps/mousepad] 06/45: Use GSettings for the search bar search-match-case setting
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 3606ff77963e1ef2cd8a2d26ed8b13f9ee229161
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 13:23:24 2014 -0700
Use GSettings for the search bar search-match-case setting
---
mousepad/mousepad-search-bar.c | 36 ++--
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index 4885867..cea04ae 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -46,8 +46,6 @@ static void mousepad_search_bar_highlight_toggled
(GtkWidget
MousepadSearchBar *bar);
static void mousepad_search_bar_match_case_toggled (GtkWidget
*button,
MousepadSearchBar *bar);
-static void mousepad_search_bar_menuitem_toggled
(GtkCheckMenuItem*item,
-
GtkToggleButton *button);
static void mousepad_search_bar_highlight_schedule
(MousepadSearchBar *bar);
static gboolean mousepad_search_bar_highlight_timeout (gpointer
user_data);
static void mousepad_search_bar_highlight_timeout_destroy (gpointer
user_data);
@@ -241,11 +239,19 @@ mousepad_search_bar_init (MousepadSearchBar *bar)
g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK
(mousepad_search_bar_match_case_toggled), bar);
gtk_widget_show (check);
+ /* keep the widgets in sync with the GSettings */
+ g_settings_bind (MOUSEPAD_GSETTINGS,
+ search-match-case,
+ check,
+ active,
+ G_BINDING_DEFAULT);
+
+ /* overflow menu item for when window is too narrow to show the tool bar
item */
bar-match_case_entry = menuitem = gtk_check_menu_item_new_with_mnemonic
(_(Mat_ch Case));
g_signal_connect_object (G_OBJECT (bar), destroy, G_CALLBACK
(gtk_widget_destroy), item, G_CONNECT_SWAPPED);
gtk_tool_item_set_proxy_menu_item (item, case-sensitive, menuitem);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), match_case);
- g_signal_connect (G_OBJECT (menuitem), toggled, G_CALLBACK
(mousepad_search_bar_menuitem_toggled), check);
+ /* Keep toolbar check button and overflow proxy menu item in sync */
+ g_object_bind_property (check, active, menuitem, active,
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
gtk_widget_show (menuitem);
}
@@ -378,15 +384,9 @@ mousepad_search_bar_match_case_toggled (GtkWidget
*button,
/* get the state of the toggle button */
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- /* set the state of the menu item */
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (bar-match_case_entry),
active);
-
/* save the state */
bar-match_case = active;
- /* save the setting */
- g_settings_set_boolean (MOUSEPAD_GSETTINGS, search-match-case, active);
-
/* search ahead with this new flags */
mousepad_search_bar_entry_changed (NULL, bar);
@@ -397,22 +397,6 @@ mousepad_search_bar_match_case_toggled (GtkWidget
*button,
static void
-mousepad_search_bar_menuitem_toggled (GtkCheckMenuItem *item,
- GtkToggleButton *button)
-{
- gboolean active;
-
- mousepad_return_if_fail (GTK_IS_CHECK_MENU_ITEM (item));
- mousepad_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
-
- /* toggle the menubar item, he/she will send the signal */
- active = gtk_check_menu_item_get_active (item);
- gtk_toggle_button_set_active (button, active);
-}
-
-
-
-static void
mousepad_search_bar_highlight_schedule (MousepadSearchBar *bar)
{
mousepad_return_if_fail (MOUSEPAD_IS_SEARCH_BAR (bar));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 19/45: Make the misc- settings window- instead
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit f8d2d51a7b4357fc8d3300052d2b0d0a0f2367aa
Author: Matthew Brush mbr...@codebrainz.ca
Date: Sun Jul 6 22:13:11 2014 -0700
Make the misc- settings window- instead
---
mousepad/mousepad-window.c | 14 +++---
mousepad/org.xfce.Mousepad.gschema.xml | 14 ++
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 3662261..5ce17b9 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -914,7 +914,7 @@ mousepad_window_save_geometry_timer (gpointer user_data)
GDK_THREADS_ENTER ();
/* check if we should remember the window geometry */
- remember_geometry = mousepad_settings_get_boolean (misc-remember-geometry);
+ remember_geometry = mousepad_settings_get_boolean
(window-remember-geometry);
if (G_LIKELY (remember_geometry))
{
/* check if the window is still visible */
@@ -1290,7 +1290,7 @@ mousepad_window_set_title (MousepadWindow *window)
mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
/* whether to show the full path */
- show_full_path = mousepad_settings_get_boolean (misc-path-in-title);
+ show_full_path = mousepad_settings_get_boolean (window-path-in-title);
/* name we display in the title */
if (G_UNLIKELY (show_full_path mousepad_document_get_filename (document)))
@@ -1483,7 +1483,7 @@ mousepad_window_notebook_added (GtkNotebook *notebook,
npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window-notebook));
/* check tabs should always be visible */
- always_show_tabs = mousepad_settings_get_boolean (misc-always-show-tabs);
+ always_show_tabs = mousepad_settings_get_boolean (window-always-show-tabs);
/* change the visibility of the tabs accordingly */
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window-notebook),
always_show_tabs || (npages 1));
@@ -1535,7 +1535,7 @@ mousepad_window_notebook_removed (GtkNotebook
*notebook,
else
{
/* check tabs should always be visible */
- always_show_tabs = mousepad_settings_get_boolean
(misc-always-show-tabs);
+ always_show_tabs = mousepad_settings_get_boolean
(window-always-show-tabs);
/* change the visibility of the tabs accordingly */
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window-notebook),
always_show_tabs || (npages 1));
@@ -2047,7 +2047,7 @@ mousepad_window_menu_tab_sizes (MousepadWindow *window)
lock_menu_updates++;
/* get the default tab sizes and active tab size */
- tmp = mousepad_settings_get_string (misc-default-tab-sizes);
+ tmp = mousepad_settings_get_string (window-default-tab-sizes);
/* get sizes array and free the temp string */
tab_sizes = g_strsplit (tmp, ,, -1);
@@ -2230,7 +2230,7 @@ mousepad_window_update_actions (MousepadWindow *window)
page_num = gtk_notebook_page_num (notebook, GTK_WIDGET (document));
/* whether we cycle tabs */
- cycle_tabs = mousepad_settings_get_boolean (misc-cycle-tabs);
+ cycle_tabs = mousepad_settings_get_boolean (window-cycle-tabs);
/* set the sensitivity of the back and forward buttons in the go menu */
action = gtk_action_group_get_action (window-action_group, back);
@@ -2560,7 +2560,7 @@ mousepad_window_recent_menu_idle (gpointer user_data)
}
/* get the recent menu limit number */
- n = mousepad_settings_get_int (misc-recent-menu-items);
+ n = mousepad_settings_get_int (window-recent-menu-items);
/* append the items to the menu */
for (li = filtered, i = 1; n 0 li != NULL; li = li-next)
diff --git a/mousepad/org.xfce.Mousepad.gschema.xml
b/mousepad/org.xfce.Mousepad.gschema.xml
index d6c3b85..6083d7b 100644
--- a/mousepad/org.xfce.Mousepad.gschema.xml
+++ b/mousepad/org.xfce.Mousepad.gschema.xml
@@ -224,9 +224,7 @@
/description
/key
-!-- Other preferences --
-
-key name=misc-always-show-tabs type=b
+key name=window-always-show-tabs type=b
defaultfalse/default
summaryAlways show tabs/summary
description
@@ -235,7 +233,7 @@
/description
/key
-key name=misc-cycle-tabs type=b
+key name=window-cycle-tabs type=b
defaultfalse/default
summaryCycle tabs/summary
description
@@ -244,7 +242,7 @@
/description
/key
-key name=misc-default-tab-sizes type=s
+key name=window-default-tab-sizes type=s
default'2,3,4,8'/default
summaryDefault tab sizes/summary
description
@@ -253,7 +251,7 @@
/description
/key
-key name=misc-path-in-title type=b
+key name=window-path-in-title type=b
defaultfalse/default
summaryShow path in window title/summary
description
@@ -262,7 +260,7 @@
/description
/key
-key name=misc-recent-menu-items type=i
+key name=window-recent-menu-items type=i
[Xfce4-commits] [apps/mousepad] 34/45: Add a basic toolbar
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 2b5155971e93df04e85419fd56966eb01f15971a
Author: Matthew Brush mbr...@codebrainz.ca
Date: Thu Jul 10 01:19:09 2014 -0700
Add a basic toolbar
And a preference to control whether it's visible, default to off.
TODO:
* See if the layout is optimal
* Show tooltip in statusbar on mouse hover like main menu items
* Allow customization? (using GtkUiManager)
---
mousepad/mousepad-settings.h |1 +
mousepad/mousepad-window-ui.xml| 22 +
mousepad/mousepad-window.c | 54 +++-
mousepad/org.xfce.Mousepad.gschema.xml |7 +
4 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h
index 7d8fb6b..9ddabc0 100644
--- a/mousepad/mousepad-settings.h
+++ b/mousepad/mousepad-settings.h
@@ -23,6 +23,7 @@ G_BEGIN_DECLS
#define MOUSEPAD_SETTING_TAB_WIDTH
/preferences/view/tab-width
#define MOUSEPAD_SETTING_WORD_WRAP
/preferences/view/word-wrap
#define MOUSEPAD_SETTING_COLOR_SCHEME
/preferences/view/color-scheme
+#define MOUSEPAD_SETTING_TOOLBAR_VISIBLE
/preferences/window/toolbar-visible
#define MOUSEPAD_SETTING_STATUSBAR_VISIBLE
/preferences/window/statusbar-visible
#define MOUSEPAD_SETTING_ALWAYS_SHOW_TABS
/preferences/window/always-show-tabs
#define MOUSEPAD_SETTING_CYCLE_TABS
/preferences/window/cycle-tabs
diff --git a/mousepad/mousepad-window-ui.xml b/mousepad/mousepad-window-ui.xml
index eabfe38..494b5b1 100644
--- a/mousepad/mousepad-window-ui.xml
+++ b/mousepad/mousepad-window-ui.xml
@@ -99,6 +99,7 @@
/menu
menuitem action=line-numbers /
separator /
+ menuitem action=toolbar /
menuitem action=statusbar /
/menu
@@ -133,6 +134,27 @@
/menu
/menubar
+ toolbar action=main-toolbar
+ toolitem action=new /
+ toolitem action=open /
+ toolitem action=save /
+ toolitem action=save-as /
+ toolitem action=revert /
+ toolitem action=close /
+ separator /
+ toolitem action=undo /
+ toolitem action=redo /
+ toolitem action=cut /
+ toolitem action=copy /
+ toolitem action=paste /
+ separator /
+ toolitem action=find /
+ toolitem action=replace /
+ toolitem action=go-to /
+ separator /
+ toolitem action=close-window /
+ /toolbar
+
popup action=tab-menu
menuitem action=save /
menuitem action=save-as /
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index d9793e2..40fc9ee 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -324,6 +324,8 @@ static void
mousepad_window_action_color_scheme (GtkToggle
MousepadWindow *window);
static void mousepad_window_action_line_numbers
(GtkToggleAction*action,
MousepadWindow *window);
+static void mousepad_window_action_toolbar
(GtkToggleAction*action,
+
MousepadWindow *window);
static void mousepad_window_action_statusbar_overwrite
(MousepadWindow *window,
gbooleanoverwrite);
static void mousepad_window_action_statusbar
(GtkToggleAction*action,
@@ -474,6 +476,7 @@ static const GtkActionEntry action_entries[] =
static const GtkToggleActionEntry toggle_action_entries[] =
{
{ line-numbers, NULL, N_(Line N_umbers), NULL, N_(Show line numbers),
G_CALLBACK (mousepad_window_action_line_numbers), FALSE, },
+ { toolbar, NULL, N_(_Toolbar), NULL, N_(Change the visibility of the
toolbar), G_CALLBACK (mousepad_window_action_toolbar), FALSE, },
{ statusbar, NULL, N_(St_atusbar), NULL, N_(Change the visibility of
the statusbar), G_CALLBACK (mousepad_window_action_statusbar), FALSE, },
{ auto-indent, NULL, N_(_Auto Indent), NULL, N_(Auto indent a new
line), G_CALLBACK (mousepad_window_action_auto_indent), FALSE, },
{ insert-spaces, NULL, N_(Insert _Spaces), NULL, N_(Insert spaces when
the tab button is pressed), G_CALLBACK (mousepad_window_action_insert_spaces),
FALSE, },
@@ -601,11 +604,14 @@ mousepad_window_init (MousepadWindow *window)
{
GtkAccelGroup *accel_group;
GtkWidget *menubar;
+ GtkWidget *toolbar;
GtkWidget *label;
GtkWidget *separator;
GtkWidget *ebox;
GtkWidget *item;
+ GtkAction *action;
gint width, height;
+ gboolean
[Xfce4-commits] [apps/mousepad] 33/45: Re-organize the main menu a bit
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 349b8477a5461ddb1d02ae36d741db17da9bfde3 Author: Matthew Brush mbr...@codebrainz.ca Date: Thu Jul 10 00:30:13 2014 -0700 Re-organize the main menu a bit * Remove Text and Navigation main menus * Add Search main menu * Put items from Text item into Edit menu * Move Find-related items from Edit menu to search menu * Move Go To from Navigation menu to Search menu * Move Filetype item to top of Document menu instead of in own group * Move the Previous/Next tab items in to the Document menu * Move the dynamic open documents/tabs list items to Document menu - TODO: the document/tab list might be better as a GtkNotebook menu? * Update order of actions functions to match menu changes --- mousepad/mousepad-window-ui.xml | 55 ++-- mousepad/mousepad-window.c | 564 +++ 2 files changed, 306 insertions(+), 313 deletions(-) diff --git a/mousepad/mousepad-window-ui.xml b/mousepad/mousepad-window-ui.xml index 07a8d2f..eabfe38 100644 --- a/mousepad/mousepad-window-ui.xml +++ b/mousepad/mousepad-window-ui.xml @@ -58,26 +58,6 @@ menuitem action=select-all / menuitem action=change-selection / separator / - menuitem action=find / - menuitem action=find-next / - menuitem action=find-previous / - menuitem action=replace / - separator / - menuitem action=preferences / -/menu - -menu action=view-menu - menuitem action=font / - separator / - menu action=color-scheme-menu -placeholder name=placeholder-color-scheme-items / - /menu - menuitem action=line-numbers / - separator / - menuitem action=statusbar / -/menu - -menu action=text-menu menu action=convert-menu menuitem action=lowercase / menuitem action=uppercase / @@ -95,14 +75,37 @@ menuitem action=line-up / menuitem action=line-down / /menu - separator / menuitem action=duplicate / - separator / menuitem action=increase-indent / menuitem action=decrease-indent / + separator / + menuitem action=preferences / +/menu + +menu action=search-menu + menuitem action=find / + menuitem action=find-next / + menuitem action=find-previous / + menuitem action=replace / + separator / + menuitem action=go-to / +/menu + +menu action=view-menu + menuitem action=font / + separator / + menu action=color-scheme-menu +placeholder name=placeholder-color-scheme-items / + /menu + menuitem action=line-numbers / + separator / + menuitem action=statusbar / /menu menu action=document-menu + menu action=language-menu +placeholder name=placeholder-language-section-items / + /menu menuitem action=auto-indent / menu action=eol-menu menuitem action=unix / @@ -118,18 +121,10 @@ separator / menuitem action=write-bom / separator / - menu action=language-menu -placeholder name=placeholder-language-section-items / - /menu -/menu - -menu action=navigation-menu menuitem action=back / menuitem action=forward / separator / placeholder name=placeholder-file-items / - separator / - menuitem action=go-to / /menu menu action=help-menu diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c index 8e9df26..d9793e2 100644 --- a/mousepad/mousepad-window.c +++ b/mousepad/mousepad-window.c @@ -279,27 +279,8 @@ static void mousepad_window_action_select_all (GtkAction MousepadWindow *window); static void mousepad_window_action_change_selection (GtkAction *action, MousepadWindow *window); -static void mousepad_window_action_find (GtkAction *action, - MousepadWindow *window); -static void mousepad_window_action_find_next (GtkAction *action, - MousepadWindow *window); -static void mousepad_window_action_find_previous (GtkAction *action, - MousepadWindow *window); -static void mousepad_window_action_replace_destroy (MousepadWindow *window); -static void mousepad_window_action_replace (GtkAction *action, -
[Xfce4-commits] [xfce/xfce4-settings] 01/01: I18n: Update translation ja (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 2c4b1c155d115a7ee6786a4af601bad4f10f85f7 Author: Masato HASHIMOTO cabezon.hashim...@gmail.com Date: Fri Jul 11 18:30:46 2014 +0200 I18n: Update translation ja (100%). 352 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/ja.po | 129 +++--- 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7852f6b..54efdac 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,10 +8,10 @@ msgid msgstr Project-Id-Version: Xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-01-26 00:30+0100\n -PO-Revision-Date: 2014-02-23 04:50+\n +POT-Creation-Date: 2014-07-10 06:30+0200\n +PO-Revision-Date: 2014-07-11 11:19+\n Last-Translator: Masato HASHIMOTO cabezon.hashim...@gmail.com\n -Language-Team: Japanese (http://www.transifex.com/projects/p/xfce/language/ja/)\n +Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-settings/language/ja/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -206,21 +206,21 @@ msgstr マウス(_M) #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 -#: ../dialogs/display-settings/main.c:137 +#: ../dialogs/display-settings/main.c:120 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid Settings manager socket msgstr 設定マネージャーソケット #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 -#: ../dialogs/display-settings/main.c:137 +#: ../dialogs/display-settings/main.c:120 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid SOCKET ID msgstr SOCKET ID #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:96 -#: ../dialogs/display-settings/main.c:138 +#: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 #: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 @@ -229,7 +229,7 @@ msgstr バージョン情報を表示する #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:1994 +#: ../dialogs/display-settings/main.c:2950 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 #: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 @@ -239,7 +239,7 @@ msgstr '%s --help' と入力すると使用方法が表示されます。 #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2013 +#: ../dialogs/display-settings/main.c:2969 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 #: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 @@ -248,7 +248,7 @@ msgstr The Xfce development team. All rights reserved. #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2014 +#: ../dialogs/display-settings/main.c:2970 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 #: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 @@ -376,7 +376,7 @@ msgid If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut -msgstr このオプションを設定すると、メニューアイテムの上にマウスポインターがある時に任意のキーの組み合わせを入力することで、そのメニューアイテムのキーボードショートカットを変更できるようになります。 +msgstr このオプションを設定すると、メニューアイテムの上にマウスポインターがあるときに任意のキーの組み合わせを入力することで、そのメニューアイテムのキーボードショートカットを変更できるようになります。 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:27 msgid Menus and Buttons @@ -410,8 +410,7 @@ msgstr 設定(_N) #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 #: ../dialogs/appearance-settings/main.c:892 -#: ../dialogs/display-settings/main.c:103 -#: ../dialogs/display-settings/main.c:114 +#: ../dialogs/display-settings/main.c:87 ../dialogs/display-settings/main.c:98 msgid None msgstr なし @@ -541,22 +540,18 @@ msgid R_esolution: msgstr 解像度(_E): #: ../dialogs/display-settings/display-dialog.glade.h:7 -msgid P_osition: -msgstr 配置(_O): - -#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid _Use this output msgstr この出力を使う(_U) -#: ../dialogs/display-settings/display-dialog.glade.h:9 +#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid _Mirror displays msgstr ミラー表示(_M) -#:
[Xfce4-commits] [xfce/xfce4-power-manager] 01/02: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-power-manager. commit 470d023fabbe2ee46d181d161f14e8f9198ad6bf Author: Urien Desterres urien.dester...@gmail.com Date: Fri Jul 11 18:30:39 2014 +0200 I18n: Update translation fr (100%). 214 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5a9ffa8..8f73e54 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,8 +13,8 @@ msgstr Project-Id-Version: Xfce4-power-manager\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2014-07-11 00:30+0200\n -PO-Revision-Date: 2014-07-11 08:24+\n -Last-Translator: Yannick Le Guen leguen.yann...@gmail.com\n +PO-Revision-Date: 2014-07-11 13:51+\n +Last-Translator: Urien Desterres urien.dester...@gmail.com\n Language-Team: French (http://www.transifex.com/projects/p/xfce4-power-manager/language/fr/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -538,63 +538,63 @@ msgstr[1] minutes msgid b%s %s/b\n Fully charged (%0.0f%%, %s runtime) -msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%, durée %s) +msgstr b%s %s/b\nComplètement chargée (%0.0f%%, durée %s) #: ../common/xfpm-power-common.c:377 #, c-format msgid b%s %s/b\n Fully charged (%0.0f%%) -msgstr b%s %s/b\t\nComplètement chargée (%0.0f%%) +msgstr b%s %s/b\nComplètement chargée (%0.0f%%) #: ../common/xfpm-power-common.c:387 #, c-format msgid b%s %s/b\n Charging (%0.0f%%, %s) -msgstr b%s %s/b\t\nEn charge (%0.0f%%, %s) +msgstr b%s %s/b\nEn charge (%0.0f%%, %s) #: ../common/xfpm-power-common.c:395 #, c-format msgid b%s %s/b\n Charging (%0.0f%%) -msgstr b%s %s/b\t\nEn charge (%0.0f%%) +msgstr b%s %s/b\nEn charge (%0.0f%%) #: ../common/xfpm-power-common.c:405 #, c-format msgid b%s %s/b\n Discharging (%0.0f%%, %s) -msgstr b%s %s/b\t\nEn décharge (%0.0f%%, %s) +msgstr b%s %s/b\nEn décharge (%0.0f%%, %s) #: ../common/xfpm-power-common.c:413 #, c-format msgid b%s %s/b\n Discharging (%0.0f%%) -msgstr b%s %s/b\t\nEn décharge (%0.0f%%) +msgstr b%s %s/b\nEn décharge (%0.0f%%) #: ../common/xfpm-power-common.c:420 #, c-format msgid b%s %s/b\n Waiting to discharge (%0.0f%%) -msgstr b%s %s/b\t\nEn attente de décharge (%0.0f%%) +msgstr b%s %s/b\nEn attente de décharge (%0.0f%%) #: ../common/xfpm-power-common.c:426 #, c-format msgid b%s %s/b\n Waiting to charge (%0.0f%%) -msgstr b%s %s/b\t\nEn attente de charge (%0.0f%%) +msgstr b%s %s/b\nEn attente de charge (%0.0f%%) #: ../common/xfpm-power-common.c:432 #, c-format msgid b%s %s/b\n is empty -msgstr b%s %s/b\t\nest vide +msgstr b%s %s/b\nest vide #. On the 2nd line we want to know if the power cord is plugged #. * in or not @@ -622,7 +622,7 @@ msgstr b%s %s/b msgid b%s %s/b\n Unknown state -msgstr b%s %s/b\t\nÉtat inconnu +msgstr b%s %s/b\nÉtat inconnu #: ../src/xfpm-power.c:334 msgid _Hibernate @@ -687,7 +687,7 @@ msgstr Le niveau de charge de votre %s est faible\nTemps restant estimé à %s msgid The requested operation requires elevated privileges.\n Please enter your password. -msgstr L’opération demandée requiert une élévation des privilèges.\nVeuillez entrer votre mot de passe. +msgstr L’opération demandée requiert des privilèges élevés.\nVeuillez entrer votre mot de passe. #. Set the dialog's title #: ../src/xfpm-power.c:1447 -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] branch master updated (15890dc - a19a8df)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-power-manager. from 15890dc I18n: Update translation fr (100%). new 470d023 I18n: Update translation fr (100%). new a19a8df I18n: Update translation ja (100%). The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/fr.po | 26 +++ po/ja.po | 110 +++--- 2 files changed, 76 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-wavelan-plugin] 01/01: I18n: Update translation ja (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository panel-plugins/xfce4-wavelan-plugin. commit b6740eae7ab16ef72bbbc25db69671ff550746da Author: Masato HASHIMOTO cabezon.hashim...@gmail.com Date: Fri Jul 11 18:31:42 2014 +0200 I18n: Update translation ja (100%). 12 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/ja.po | 68 ++ 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/po/ja.po b/po/ja.po index e6476d6..d0037d5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,72 +1,70 @@ -# Japanese translations for xfce4-wavelan-plugin package. -# Copyright (C) 2003-2012 Benedikt Meurer. -# This file is distributed under the same license as -# the xfce4-wavelan-plugin package. -# Daichi Kawahata dai...@xfce.org, 2006. -# Nobuhiro Iwamatsu iwama...@nigauri.org, 2008. -# Masato Hashimoto cabezon.hashim...@gmail.com,2012. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Daichi Kawahata dai...@xfce.org, 2006 +# Nobuhiro Iwamatsu iwama...@nigauri.org, 2008 msgid msgstr -Project-Id-Version: xfce4-wavelan-plugin 0.4.3svn\n +Project-Id-Version: Xfce Panel Plugins\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-18 00:57+\n -PO-Revision-Date: 2012-04-13 21:20+0900\n -Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n -Language-Team: Japanese xfce-users...@ml.fdiary.net\n +POT-Creation-Date: 2014-06-13 00:31+0200\n +PO-Revision-Date: 2014-07-11 11:47+\n +Last-Translator: Masato HASHIMOTO cabezon.hashim...@gmail.com\n +Language-Team: Japanese (http://www.transifex.com/projects/p/xfce-panel-plugins/language/ja/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n Language: ja\n +Plural-Forms: nplurals=1; plural=0;\n -#: ../panel-plugin/wavelan.c:153 +#: ../panel-plugin/wavelan.c:159 msgid No carrier signal msgstr キャリアーシグナルがありません -#: ../panel-plugin/wavelan.c:172 +#: ../panel-plugin/wavelan.c:178 msgid No device configured msgstr デバイスが設定されていません -#: ../panel-plugin/wavelan.c:521 +#: ../panel-plugin/wavelan.c:499 msgid Wavelan Plugin Options msgstr Wavelan プラグインオプション -#: ../panel-plugin/wavelan.c:536 +#: ../panel-plugin/wavelan.c:514 msgid Properties msgstr 設定 -#: ../panel-plugin/wavelan.c:547 +#: ../panel-plugin/wavelan.c:525 msgid Interface msgstr インターフェイス -#: ../panel-plugin/wavelan.c:568 +#: ../panel-plugin/wavelan.c:546 msgid _Autohide when offline msgstr オフライン時には自動的に隠す(_A) -#: ../panel-plugin/wavelan.c:578 -msgid Autohide when no hardware present -msgstr ハードウェアがない時は自動的に隠す +#: ../panel-plugin/wavelan.c:556 +msgid Autohide when no _hardware present +msgstr ハードウェアが存在しないときは自動的に隠す(_H) -#: ../panel-plugin/wavelan.c:589 +#: ../panel-plugin/wavelan.c:567 msgid -Note: This will make it difficult to remove or configure the plugin if there -is no device detected. -msgstr -メモ: デバイスが検知されない場合、プラグインを外したり、設定することが難しく -なります。 +Note: This will make it difficult to remove or configure the plugin if there + is no device detected. +msgstr メモ: デバイスが検知されない場合、プラグインを外したり、設定したりすることが難しくなります。 -#: ../panel-plugin/wavelan.c:597 -msgid Enable signal quality colors -msgstr 信号品質色を有効にする +#: ../panel-plugin/wavelan.c:575 +msgid Enable sig_nal quality colors +msgstr 信号品質色を有効にする(_N) -#: ../panel-plugin/wavelan.c:608 -msgid Show icon -msgstr アイコンを表示する +#: ../panel-plugin/wavelan.c:586 +msgid Show _icon +msgstr アイコンを表示する(_I) -#: ../panel-plugin/wavelan.c:671 ../panel-plugin/wavelan.desktop.in.h:1 +#: ../panel-plugin/wavelan.c:614 ../panel-plugin/wavelan.desktop.in.h:2 msgid View the status of a wireless network msgstr 無線ネットワークの状態を表示します -#: ../panel-plugin/wavelan.desktop.in.h:2 +#: ../panel-plugin/wavelan.desktop.in.h:1 msgid Wavelan msgstr Wavelan -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-wavelan-plugin] branch master updated (4f618b3 - b6740ea)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository panel-plugins/xfce4-wavelan-plugin. from 4f618b3 I18n: Update translation pt_BR (100%). new b6740ea I18n: Update translation ja (100%). The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/ja.po | 68 ++ 1 file changed, 33 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (515dd53 - 2c4b1c1)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from 515dd53 I18n: Update translation fr (100%). new 2c4b1c1 I18n: Update translation ja (100%). The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/ja.po | 129 +++--- 1 file changed, 64 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] 02/02: I18n: Update translation ja (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-power-manager. commit a19a8df84ba19f6dc297bb02ee1264b44579b49f Author: Masato HASHIMOTO cabezon.hashim...@gmail.com Date: Fri Jul 11 18:30:39 2014 +0200 I18n: Update translation ja (100%). 214 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/ja.po | 110 +++--- 1 file changed, 63 insertions(+), 47 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8977031..446e06f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: Xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-08 00:30+0200\n -PO-Revision-Date: 2014-07-09 12:46+\n +POT-Creation-Date: 2014-07-11 00:30+0200\n +PO-Revision-Date: 2014-07-11 11:34+\n Last-Translator: Masato HASHIMOTO cabezon.hashim...@gmail.com\n Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-power-manager/language/ja/)\n MIME-Version: 1.0\n @@ -136,22 +136,38 @@ msgid bPower saving/b msgstr b省電力/b #: ../data/interfaces/xfpm-settings.ui.h:30 -msgid On inactivity reduce to -msgstr 未使用時の輝度低下 +msgid Display +msgstr ディスプレイ #: ../data/interfaces/xfpm-settings.ui.h:31 -msgid Reduce after -msgstr 輝度を下げるまでの時間 +msgid _Handle display brightness +msgstr ディスプレイの輝度を調節する(_H) #: ../data/interfaces/xfpm-settings.ui.h:32 -msgid bBrightness/b -msgstr b輝度/b +msgid _Register display brightness shortcut keys +msgstr ディスプレイの輝度のショートカットキーを登録する(_R) #: ../data/interfaces/xfpm-settings.ui.h:33 -msgid Display -msgstr ディスプレイ +msgid Change per s_tep: +msgstr 変更ステップ(_T) #: ../data/interfaces/xfpm-settings.ui.h:34 +msgid bKeys/b +msgstr bキー/b + +#: ../data/interfaces/xfpm-settings.ui.h:35 +msgid On inactivity reduce to +msgstr 未使用時の輝度低下 + +#: ../data/interfaces/xfpm-settings.ui.h:36 +msgid Reduce after +msgstr 輝度を下げるまでの時間 + +#: ../data/interfaces/xfpm-settings.ui.h:37 +msgid _Brightness +msgstr 輝度(_B) + +#: ../data/interfaces/xfpm-settings.ui.h:38 msgid Nothing msgstr 何もしない @@ -511,74 +527,74 @@ msgstr[0] 分 #: ../common/xfpm-power-common.c:369 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%, %s runtime)\t -msgstr b%s %s/b\t\nフル充電されています (%0.0f%%, バッテリ駆動時間 %s)\t +b%s %s/b\n +Fully charged (%0.0f%%, %s runtime) +msgstr b%s %s/b\nフル充電されています (%0.0f%%, バッテリ駆動時間 %s) #: ../common/xfpm-power-common.c:377 #, c-format msgid -b%s %s/b\t\n -Fully charged (%0.0f%%)\t -msgstr b%s %s/b\t\nフル充電されています (%0.0f%%)\t +b%s %s/b\n +Fully charged (%0.0f%%) +msgstr b%s %s/b\nフル充電されています (%0.0f%%) #: ../common/xfpm-power-common.c:387 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%, %s)\t -msgstr b%s %s/b\t\n充電中です (%0.0f%%, %s)\t +b%s %s/b\n +Charging (%0.0f%%, %s) +msgstr b%s %s/b\n充電中です (%0.0f%%, %s) #: ../common/xfpm-power-common.c:395 #, c-format msgid -b%s %s/b\t\n -Charging (%0.0f%%)\t -msgstr b%s %s/b\t\n充電中です (%0.0f%%)\t +b%s %s/b\n +Charging (%0.0f%%) +msgstr b%s %s/b\n充電中です (%0.0f%%) #: ../common/xfpm-power-common.c:405 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%, %s)\t -msgstr b%s %s/b\t\n使用中です (%0.0f%%, %s)\t +b%s %s/b\n +Discharging (%0.0f%%, %s) +msgstr b%s %s/b\n使用中です (%0.0f%%, %s) #: ../common/xfpm-power-common.c:413 #, c-format msgid -b%s %s/b\t\n -Discharging (%0.0f%%)\t -msgstr b%s %s/b\t\n使用中です (%0.0f%%)\t +b%s %s/b\n +Discharging (%0.0f%%) +msgstr b%s %s/b\n使用中です (%0.0f%%) #: ../common/xfpm-power-common.c:420 #, c-format msgid -b%s %s/b\t\n -Waiting to discharge (%0.0f%%)\t -msgstr b%s %s/b\t\n使用中です (%0.0f%%)\t +b%s %s/b\n +Waiting to discharge (%0.0f%%) +msgstr b%s %s/b\n使用中です (%0.0f%%) #: ../common/xfpm-power-common.c:426 #, c-format msgid -b%s %s/b\t\n -Waiting to charge (%0.0f%%)\t -msgstr b%s %s/b\t\n充電待ちです (%0.0f%%)\t +b%s %s/b\n +Waiting to charge (%0.0f%%) +msgstr b%s %s/b\n充電待ちです (%0.0f%%) #: ../common/xfpm-power-common.c:432 #, c-format msgid -b%s %s/b\t\n -is empty\t -msgstr b%s %s/b\t\n空です\t +b%s %s/b\n +is empty +msgstr b%s %s/b\n空です #. On the 2nd line we want to know if the power cord is plugged #. * in or not #: ../common/xfpm-power-common.c:441 #, c-format msgid -b%s %s/b\t\n -%s\t -msgstr b%s %s/b\t\n%s\t +b%s %s/b\n +%s +msgstr b%s %s/b\n%s #: ../common/xfpm-power-common.c:442 msgid Not plugged in @@ -588,16 +604,16 @@ msgstr AC 未接続 #. * which will probably just be Computer #: ../common/xfpm-power-common.c:448 #, c-format -msgid b%s %s/b\t -msgstr b%s %s/b\t +msgid b%s %s/b +msgstr b%s %s/b #. unknown device state, just display the percentage #: ../common/xfpm-power-common.c:453 #, c-format msgid -b%s %s/b\t\n -Unknown state\t -msgstr b%s %s/b\t\n状態が不明です\t +b%s %s/b\n +Unknown state +msgstr b%s %s/b\n状態が不明です #: ../src/xfpm-power.c:334 msgid _Hibernate @@ -660,9 +676,9 @@ msgstr %s の充電レベルが低くなっています\n予想駆動時間は #: ../src/xfpm-power.c:1438 msgid -The
[Xfce4-commits] [xfce/xfce4-settings] 01/01: I18n: Update translation hr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 3d53d32b3dd8375678daa83531dfaf83dc73315b Author: Edin Veskovic evesko...@gmail.com Date: Sat Jul 12 00:30:42 2014 +0200 I18n: Update translation hr (100%). 352 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/hr.po | 125 +++--- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/po/hr.po b/po/hr.po index 9b1ad2d..26c8710 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# schizo evesko...@gmail.com, 2014 +# Edin Veskovic evesko...@gmail.com, 2014 # Ivica Kolić ik...@yahoo.com, 2010 # Ivica Kolić ik...@yahoo.com, 2010 # Ivica Kolić ik...@yahoo.com, 2013-2014 @@ -11,9 +11,9 @@ msgid msgstr Project-Id-Version: Xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-01-26 00:30+0100\n -PO-Revision-Date: 2014-05-28 20:52+\n -Last-Translator: schizo evesko...@gmail.com\n +POT-Creation-Date: 2014-07-10 06:30+0200\n +PO-Revision-Date: 2014-07-11 22:16+\n +Last-Translator: Edin Veskovic evesko...@gmail.com\n Language-Team: Croatian (http://www.transifex.com/projects/p/xfce4-settings/language/hr/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -209,21 +209,21 @@ msgstr _Miš #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 -#: ../dialogs/display-settings/main.c:137 +#: ../dialogs/display-settings/main.c:120 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid Settings manager socket msgstr Priključak upravitelja postavkama #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 -#: ../dialogs/display-settings/main.c:137 +#: ../dialogs/display-settings/main.c:120 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid SOCKET ID msgstr SOCKET ID #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:96 -#: ../dialogs/display-settings/main.c:138 +#: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 #: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 @@ -232,7 +232,7 @@ msgstr Inforemacija o verziji #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:1994 +#: ../dialogs/display-settings/main.c:2950 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 #: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 @@ -242,7 +242,7 @@ msgstr Upiši '%s --help' za upotrebu. #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2013 +#: ../dialogs/display-settings/main.c:2969 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 #: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 @@ -251,7 +251,7 @@ msgstr Xfce razvojni tim.Sva prava pridržana. #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2014 +#: ../dialogs/display-settings/main.c:2970 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 #: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 @@ -413,8 +413,7 @@ msgstr Postav_ke #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 #: ../dialogs/appearance-settings/main.c:892 -#: ../dialogs/display-settings/main.c:103 -#: ../dialogs/display-settings/main.c:114 +#: ../dialogs/display-settings/main.c:87 ../dialogs/display-settings/main.c:98 msgid None msgstr Nijedan @@ -544,22 +543,18 @@ msgid R_esolution: msgstr R_ezolucija: #: ../dialogs/display-settings/display-dialog.glade.h:7 -msgid P_osition: -msgstr P_ozicija: - -#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid _Use this output msgstr _Koristi ovaj izlaz -#: ../dialogs/display-settings/display-dialog.glade.h:9 +#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid _Mirror displays msgstr _Zrcali zaslone -#: ../dialogs/display-settings/display-dialog.glade.h:10 +#: ../dialogs/display-settings/display-dialog.glade.h:9 msgid Configure _new displays when connected msgstr Konfiguriraj _novi zaslon kada se spoji -#: ../dialogs/display-settings/display-dialog.glade.h:11 +#:
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (2c4b1c1 - 3d53d32)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from 2c4b1c1 I18n: Update translation ja (100%). new 3d53d32 I18n: Update translation hr (100%). The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/hr.po | 125 +++--- 1 file changed, 62 insertions(+), 63 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] branch master updated (3b084a5 - 95864c3)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 3b084a5 Merge branch 'preferences-menu-toolbar' new 95864c3 Update POTFILES.in for the new/removed files The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: po/POTFILES.in |5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/01: Update POTFILES.in for the new/removed files
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 95864c309bc1308320ad7e49d03dc3920edc920e Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 16:31:28 2014 -0700 Update POTFILES.in for the new/removed files --- po/POTFILES.in |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index cf290f4..4fc42ad 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,10 +9,13 @@ mousepad/mousepad-document.c mousepad/mousepad-encoding-dialog.c mousepad/mousepad-encoding.c mousepad/mousepad-file.c -mousepad/mousepad-preferences.c +mousepad/mousepad-prefs-dialog.c +mousepad/mousepad-prefs-dialog.glade mousepad/mousepad-print.c mousepad/mousepad-replace-dialog.c mousepad/mousepad-search-bar.c +mousepad/mousepad-settings.c +mousepad/mousepad-settings-store.c mousepad/mousepad-statusbar.c mousepad/mousepad-util.c mousepad/mousepad-view.c -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Hide brightness tab when LCD brightness is unavailable
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 1b079c85d73c1e25c1b5a13f7ec561979326b823
Author: Harald Judt h.j...@gmx.at
Date: Fri Jul 11 11:49:23 2014 +0200
Hide brightness tab when LCD brightness is unavailable
---
settings/xfpm-settings.c | 92 --
1 file changed, 39 insertions(+), 53 deletions(-)
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 0d3a36d..4fb7202 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -905,32 +905,6 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean
auth_suspend,
}
/*
- * Brightness on battery power
- */
-brg = GTK_WIDGET (gtk_builder_get_object (xml ,brg-on-battery));
-brg_level = GTK_WIDGET (gtk_builder_get_object (xml
,brg-level-on-battery));
-if ( has_lcd_brightness )
-{
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_ON_BATTERY, 120);
- gtk_range_set_value (GTK_RANGE(brg), val);
-
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_LEVEL_ON_BATTERY, 20);
- gtk_range_set_value (GTK_RANGE (brg_level), val);
-
-}
-else
-{
- gtk_widget_set_sensitive (GTK_WIDGET (brg), FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET (brg_level), FALSE);
-}
-#ifndef HAVE_DPMS
-if ( !has_lcd_brightness )
-{
- gtk_notebook_remove_page (GTK_NOTEBOOK (nt), 1);
-}
-#endif
-
-/*
* Hard drive energy saving
*/
spin_down_hdd = GTK_WIDGET (gtk_builder_get_object (xml, spin-down-hdd));
@@ -980,6 +954,26 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean
auth_suspend,
{
gtk_widget_set_tooltip_text (spin_down_hdd, _(Spinning down hard disks
permission denied));
}
+
+/*
+ * Brightness on battery
+ */
+if ( has_lcd_brightness )
+{
+brg = GTK_WIDGET (gtk_builder_get_object (xml ,brg-on-battery));
+brg_level = GTK_WIDGET (gtk_builder_get_object (xml
,brg-level-on-battery));
+val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_ON_BATTERY, 120);
+gtk_range_set_value (GTK_RANGE(brg), val);
+
+val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_LEVEL_ON_BATTERY, 20);
+gtk_range_set_value (GTK_RANGE (brg_level), val);
+
+}
+else
+{
+gtk_notebook_remove_page (GTK_NOTEBOOK (nt), 3);
+}
+
}
static void
@@ -1081,33 +1075,6 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean
auth_suspend,
gtk_widget_hide (lid);
}
-/*
- *
- * Brightness on AC power
- */
-brg = GTK_WIDGET (gtk_builder_get_object (xml ,brg-on-ac));
-brg_level = GTK_WIDGET (gtk_builder_get_object (xml ,brg-level-on-ac));
-if ( has_lcd_brightness )
-{
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_ON_AC, 9);
- gtk_range_set_value (GTK_RANGE (brg), val);
-
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_LEVEL_ON_AC, 80);
- gtk_range_set_value (GTK_RANGE (brg_level), val);
-
-}
-else
-{
- gtk_widget_set_sensitive (GTK_WIDGET (brg), FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET (brg_level), FALSE);
-}
-#ifndef HAVE_DPMS
-if ( !has_lcd_brightness )
-{
- gtk_notebook_remove_page (GTK_NOTEBOOK (GTK_WIDGET
(gtk_builder_get_object (xml, on-ac-notebook))), 1);
-}
-#endif
-
spin_down_hdd = GTK_WIDGET (gtk_builder_get_object (xml, spin-down-hdd));
/*
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (spin_down),
@@ -1125,6 +1092,25 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean
auth_suspend,
gtk_widget_set_tooltip_text (spin_down_hdd, _(Spinning down hard disks
permission denied));
}
+ /*
+* Brightness on AC power
+*/
+ if ( has_lcd_brightness )
+ {
+ brg = GTK_WIDGET (gtk_builder_get_object (xml ,brg-on-ac));
+ brg_level = GTK_WIDGET (gtk_builder_get_object (xml
,brg-level-on-ac));
+ val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_ON_AC, 9);
+ gtk_range_set_value (GTK_RANGE(brg), val);
+
+ val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX
BRIGHTNESS_LEVEL_ON_AC, 80);
+ gtk_range_set_value (GTK_RANGE (brg_level), val);
+
+ }
+ else
+ {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (nt), 3);
+ }
+
}
static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-power-manager] branch master updated (a19a8df - 1b079c8)
This is an automated email from the git hooks/post-receive script. eric pushed a change to branch master in repository xfce/xfce4-power-manager. from a19a8df I18n: Update translation ja (100%). new 1b079c8 Hide brightness tab when LCD brightness is unavailable The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: settings/xfpm-settings.c | 92 -- 1 file changed, 39 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 03/03: Add Enter and Shift+Enter support to search bar entry
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 6715fa8f91a38e51fa59202ec072b3ab9058f268
Author: Matthew Brush mbr...@codebrainz.ca
Date: Fri Jul 11 19:13:50 2014 -0700
Add Enter and Shift+Enter support to search bar entry
Closes #10438 (https://bugzilla.xfce.org/show_bug.cgi?id=10438)
To search forwards and backwards using those shortcuts.
---
mousepad/mousepad-search-bar.c | 41
1 file changed, 41 insertions(+)
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index 75d8851..1f86fc2 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -40,6 +40,10 @@ static void mousepad_search_bar_finalize
(GObject
static void mousepad_search_bar_find_string
(MousepadSearchBar *bar,
MousepadSearchFlags flags);
static void mousepad_search_bar_hide_clicked
(MousepadSearchBar *bar);
+static void mousepad_search_bar_entry_activate (GtkWidget
*entry,
+
MousepadSearchBar *bar);
+static void mousepad_search_bar_entry_activate_backward(GtkWidget
*entry,
+
MousepadSearchBar *bar);
static void mousepad_search_bar_entry_changed (GtkWidget
*entry,
MousepadSearchBar *bar);
static void mousepad_search_bar_highlight_toggled (GtkWidget
*button,
@@ -107,6 +111,7 @@ static void
mousepad_search_bar_class_init (MousepadSearchBarClass *klass)
{
GObjectClass *gobject_class;
+ GObjectClass *entry_class;
GtkBindingSet *binding_set;
gobject_class = G_OBJECT_CLASS (klass);
@@ -148,6 +153,22 @@ mousepad_search_bar_class_init (MousepadSearchBarClass
*klass)
GtkToolButton::icon-spacing = 2\n
}\n
widget \MousepadWindow.*.Gtk*ToolButton\ style
\mousepad-button-style\\n);
+
+ /* add an activate-backwards signal to GtkEntry */
+ entry_class = g_type_class_ref (GTK_TYPE_ENTRY);
+ if (G_LIKELY (g_signal_lookup(activate-backward, GTK_TYPE_ENTRY) == 0))
+{
+ /* install the signal */
+ g_signal_new(activate-backward,
+ GTK_TYPE_ENTRY,
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ binding_set = gtk_binding_set_by_class(entry_class);
+ gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_SHIFT_MASK,
activate-backward, 0);
+}
+ g_type_class_unref (entry_class);
}
@@ -191,6 +212,8 @@ mousepad_search_bar_init (MousepadSearchBar *bar)
gtk_container_add (GTK_CONTAINER (item), bar-entry);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), bar-entry);
g_signal_connect (G_OBJECT (bar-entry), changed, G_CALLBACK
(mousepad_search_bar_entry_changed), bar);
+ g_signal_connect (G_OBJECT (bar-entry), activate, G_CALLBACK
(mousepad_search_bar_entry_activate), bar);
+ g_signal_connect (G_OBJECT (bar-entry), activate-backward, G_CALLBACK
(mousepad_search_bar_entry_activate_backward), bar);
gtk_widget_show (bar-entry);
/* next button */
@@ -318,6 +341,24 @@ mousepad_search_bar_hide_clicked (MousepadSearchBar *bar)
static void
+mousepad_search_bar_entry_activate (GtkWidget *entry,
+MousepadSearchBar *bar)
+{
+ mousepad_search_bar_find_next (bar);
+}
+
+
+
+static void
+mousepad_search_bar_entry_activate_backward (GtkWidget *entry,
+ MousepadSearchBar *bar)
+{
+ mousepad_search_bar_find_previous (bar);
+}
+
+
+
+static void
mousepad_search_bar_entry_changed (GtkWidget *entry,
MousepadSearchBar *bar)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] branch master updated (95864c3 - 6715fa8)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 95864c3 Update POTFILES.in for the new/removed files new 0e350fc Fill search textbox with the selected text new 839ecf1 Change keyboard shortcuts for Find Next/Previous and Go To new 6715fa8 Add Enter and Shift+Enter support to search bar entry The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: mousepad/mousepad-replace-dialog.c |8 ++ mousepad/mousepad-replace-dialog.h |2 ++ mousepad/mousepad-search-bar.c | 51 mousepad/mousepad-search-bar.h |2 ++ mousepad/mousepad-window.c | 43 +++--- 5 files changed, 103 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/03: Fill search textbox with the selected text
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 0e350fc12258f0d89a4e04520d13bb4f41e8e347
Author: Matthew Brush mbr...@codebrainz.ca
Date: Fri Jul 11 18:30:39 2014 -0700
Fill search textbox with the selected text
Closes #5905 (https://bugzilla.xfce.org/show_bug.cgi?id=5905)
Thanks to Carlos Ortiz for the original patch and André Miranda for
re-writing the patch for new Mousepad.
---
mousepad/mousepad-replace-dialog.c |8
mousepad/mousepad-replace-dialog.h |2 ++
mousepad/mousepad-search-bar.c | 10 ++
mousepad/mousepad-search-bar.h |2 ++
mousepad/mousepad-window.c | 37
5 files changed, 59 insertions(+)
diff --git a/mousepad/mousepad-replace-dialog.c
b/mousepad/mousepad-replace-dialog.c
index 8bf568a..6426453 100644
--- a/mousepad/mousepad-replace-dialog.c
+++ b/mousepad/mousepad-replace-dialog.c
@@ -566,3 +566,11 @@ mousepad_replace_dialog_page_switched
(MousepadReplaceDialog *dialog)
{
mousepad_replace_dialog_changed (dialog);
}
+
+
+
+void
+mousepad_replace_dialog_set_text (MousepadReplaceDialog *dialog, gchar *text)
+{
+ gtk_entry_set_text (GTK_ENTRY (dialog-search_entry), text);
+}
diff --git a/mousepad/mousepad-replace-dialog.h
b/mousepad/mousepad-replace-dialog.h
index b3e7d2f..15db2ce 100644
--- a/mousepad/mousepad-replace-dialog.h
+++ b/mousepad/mousepad-replace-dialog.h
@@ -37,6 +37,8 @@ voidmousepad_replace_dialog_history_clean (void);
voidmousepad_replace_dialog_page_switched (MousepadReplaceDialog
*dialog);
+voidmousepad_replace_dialog_set_text (MousepadReplaceDialog
*dialog, gchar *text);
+
G_END_DECLS
#endif /* !__MOUSEPAD_REPLACE_DIALOG_H__ */
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index 917bb3c..75d8851 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -505,3 +505,13 @@ mousepad_search_bar_find_previous (MousepadSearchBar *bar)
/* search */
mousepad_search_bar_find_string (bar, flags);
}
+
+
+
+void
+mousepad_search_bar_set_text (MousepadSearchBar *bar, gchar *text)
+{
+ mousepad_return_if_fail (MOUSEPAD_IS_SEARCH_BAR (bar));
+
+ gtk_entry_set_text (GTK_ENTRY (bar-entry), text);
+}
diff --git a/mousepad/mousepad-search-bar.h b/mousepad/mousepad-search-bar.h
index 4dbfe11..d2ea0e3 100644
--- a/mousepad/mousepad-search-bar.h
+++ b/mousepad/mousepad-search-bar.h
@@ -41,6 +41,8 @@ voidmousepad_search_bar_find_next
(MousepadSearchBar *bar);
voidmousepad_search_bar_find_previous (MousepadSearchBar *bar);
+voidmousepad_search_bar_set_text(MousepadSearchBar *bar,
gchar *text);
+
G_END_DECLS
#endif /* !__MOUSEPAD_SEARCH_BAR_H__ */
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 1acc390..cf98a8e 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -4629,6 +4629,10 @@ static void
mousepad_window_action_find (GtkAction *action,
MousepadWindow *window)
{
+ GtkTextIter selection_start;
+ GtkTextIter selection_end;
+ gchar *selection;
+
mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (window-active));
@@ -4644,6 +4648,22 @@ mousepad_window_action_find (GtkAction *action,
g_signal_connect_swapped (G_OBJECT (window-search_bar), search,
G_CALLBACK (mousepad_window_search), window);
}
+ /* set the search entry text if the search bar is hidden*/
+ if (GTK_WIDGET_VISIBLE (window-search_bar) == FALSE)
+{
+ if (gtk_text_buffer_get_has_selection (window-active-buffer) == TRUE)
+{
+ gtk_text_buffer_get_selection_bounds (window-active-buffer,
selection_start, selection_end);
+ selection = gtk_text_buffer_get_text (window-active-buffer,
selection_start, selection_end, 0);
+
+ /* selection should be one line */
+ if (g_strrstr (selection, \n) == NULL g_strrstr (selection,
\r) == NULL)
+mousepad_search_bar_set_text (MOUSEPAD_SEARCH_BAR
(window-search_bar), selection);
+
+ g_free (selection);
+}
+}
+
/* show the search bar */
gtk_widget_show (window-search_bar);
@@ -4709,6 +4729,10 @@ static void
mousepad_window_action_replace (GtkAction *action,
MousepadWindow *window)
{
+ GtkTextIter selection_start;
+ GtkTextIter selection_end;
+ gchar *selection;
+
mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (window-active));
@@ -4722,6 +4746,19 @@ mousepad_window_action_replace (GtkAction *action,
gtk_window_set_transient_for (GTK_WINDOW (window-replace_dialog),
GTK_WINDOW (window));
gtk_widget_show
[Xfce4-commits] [apps/mousepad] 02/03: Change keyboard shortcuts for Find Next/Previous and Go To
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 839ecf1145559e3959ff0368cc45e9c7ac90f201
Author: Matthew Brush mbr...@codebrainz.ca
Date: Fri Jul 11 18:39:51 2014 -0700
Change keyboard shortcuts for Find Next/Previous and Go To
Hopefully this doesn't annoy anyone but these are the more usual
keyboard shortcuts for these uses. See bug report for details. If
anyone has an idea for how to provide both the old and new keyboard
shortcuts without ugly hacks, we could try and support the old and
new shortcuts together.
Closes #9745 (https://bugzilla.xfce.org/show_bug.cgi?id=9745)
---
mousepad/mousepad-window.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index cf98a8e..231d052 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -455,10 +455,10 @@ static const GtkActionEntry action_entries[] =
{ search-menu, NULL, N_(_Search), NULL, NULL, NULL, },
{ find, GTK_STOCK_FIND, NULL, NULL, N_(Search for text), G_CALLBACK
(mousepad_window_action_find), },
-{ find-next, NULL, N_(Find _Next), F3, N_(Search forwards for the
same text), G_CALLBACK (mousepad_window_action_find_next), },
-{ find-previous, NULL, N_(Find _Previous), shiftF3, N_(Search
backwards for the same text), G_CALLBACK
(mousepad_window_action_find_previous), },
+{ find-next, NULL, N_(Find _Next), controlg, N_(Search forwards
for the same text), G_CALLBACK (mousepad_window_action_find_next), },
+{ find-previous, NULL, N_(Find _Previous), shiftcontrolg,
N_(Search backwards for the same text), G_CALLBACK
(mousepad_window_action_find_previous), },
{ replace, GTK_STOCK_FIND_AND_REPLACE, N_(Find and Rep_lace...), NULL,
N_(Search for and replace text), G_CALLBACK (mousepad_window_action_replace),
},
-{ go-to, GTK_STOCK_JUMP_TO, N_(_Go to...), controlG, N_(Go to a
specific location in the document), G_CALLBACK
(mousepad_window_action_go_to_position), },
+{ go-to, GTK_STOCK_JUMP_TO, N_(_Go to...), controll, N_(Go to a
specific location in the document), G_CALLBACK
(mousepad_window_action_go_to_position), },
{ view-menu, NULL, N_(_View), NULL, NULL, NULL, },
{ font, GTK_STOCK_SELECT_FONT, N_(Select F_ont...), NULL, N_(Change
the editor font), G_CALLBACK (mousepad_window_action_select_font), },
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] branch master updated (6715fa8 - 9525d1f)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 6715fa8 Add Enter and Shift+Enter support to search bar entry new 9525d1f Change line number printing label The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: mousepad/mousepad-print.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/01: Change line number printing label
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit 9525d1f7d7e824286f51ff2111a5a82098d23a39 Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 20:01:20 2014 -0700 Change line number printing label To make it easier to translate in various languages. Also add a tooltip to further explain the setting in case the label is unclear. Closes #8942 (https://bugzilla.xfce.org/show_bug.cgi?id=8942) --- mousepad/mousepad-print.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mousepad/mousepad-print.c b/mousepad/mousepad-print.c index 29625cf..f9ae90f 100644 --- a/mousepad/mousepad-print.c +++ b/mousepad/mousepad-print.c @@ -649,13 +649,17 @@ mousepad_print_create_custom_widget (GtkPrintOperation *operation) gtk_container_add (GTK_CONTAINER (alignment), print-widget_line_numbers_hbox); gtk_widget_show (print-widget_line_numbers_hbox); - label = gtk_label_new (_(Number every)); + label = gtk_label_new (_(Numbering interval:)); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (print-widget_line_numbers_hbox), label, FALSE, TRUE, 0); gtk_widget_show (label); adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (1.0, 1.0, 100.0, 1.0, 0.0, 0.0)); print-widget_line_numbers_spin = gtk_spin_button_new (adjustment, 1.0, 0); + gtk_widget_set_tooltip_text (print-widget_line_numbers_spin, +_(The interval at which to print line numbers. For example a value of 1 + will print a line number on each line, a value of 2 will print a line + number on every other line, and so on.)); gtk_spin_button_set_value (GTK_SPIN_BUTTON (print-widget_line_numbers_spin), (gdouble) print-line_number_increment); g_signal_connect (G_OBJECT (print-widget_line_numbers_spin), @@ -665,11 +669,6 @@ mousepad_print_create_custom_widget (GtkPrintOperation *operation) gtk_box_pack_start (GTK_BOX (print-widget_line_numbers_hbox), print-widget_line_numbers_spin, FALSE, TRUE, 0); gtk_widget_show (print-widget_line_numbers_spin); - label = gtk_label_new (_(line(s))); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (print-widget_line_numbers_hbox), label, FALSE, TRUE, 0); - gtk_widget_show (label); - button = print-widget_text_wrapping = gtk_check_button_new_with_mnemonic (_(Enable text _wrapping)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), gtk_source_print_compositor_get_wrap_mode (print-compositor) == GTK_WRAP_NONE ? FALSE : TRUE); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/01: Fix line number printing when option is disabled
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 8525dbdaf58cce86f235ec92923e1c48f493c6d9
Author: Matthew Brush mbr...@codebrainz.ca
Date: Fri Jul 11 20:17:53 2014 -0700
Fix line number printing when option is disabled
Closes #9813 (https://bugzilla.xfce.org/show_bug.cgi?id=9813)
Thanks to Christian Hesse for providing the patch.
---
mousepad/mousepad-print.c | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/mousepad/mousepad-print.c b/mousepad/mousepad-print.c
index f9ae90f..2a97b45 100644
--- a/mousepad/mousepad-print.c
+++ b/mousepad/mousepad-print.c
@@ -285,6 +285,12 @@ mousepad_print_settings_load (GtkPrintOperation *operation)
else
gtk_source_print_compositor_set_line_numbers_font_name
(print-compositor, body_font);
+/* setup line number printing */
+if (print-print_line_numbers)
+ gtk_source_print_compositor_set_print_line_numbers (print-compositor,
print-line_number_increment);
+else
+ gtk_source_print_compositor_set_print_line_numbers (print-compositor,
0);
+
/* cleanup */
g_free (body_font);
g_free (header_font);
@@ -501,6 +507,10 @@ mousepad_print_button_toggled (GtkWidget *button,
{
print-print_line_numbers = active;
gtk_widget_set_sensitive (print-widget_line_numbers_hbox, active);
+if (active)
+ gtk_source_print_compositor_set_print_line_numbers (print-compositor,
print-line_number_increment);
+else
+ gtk_source_print_compositor_set_print_line_numbers (print-compositor,
0);
}
else if (button == print-widget_text_wrapping)
gtk_source_print_compositor_set_wrap_mode (print-compositor, active ?
GTK_WRAP_WORD : GTK_WRAP_NONE);
@@ -535,13 +545,8 @@ mousepad_print_spin_value_changed (GtkSpinButton *button,
{
print-line_number_increment = gtk_spin_button_get_value_as_int (button);
- if (print-line_number_increment 0 print-print_line_numbers)
-{
- gtk_source_print_compositor_set_print_line_numbers (print-compositor,
-
print-line_number_increment);
-}
- else
-gtk_source_print_compositor_set_print_line_numbers (print-compositor, 0);
+ gtk_source_print_compositor_set_print_line_numbers (print-compositor,
+
print-line_number_increment);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] branch master updated (9525d1f - 8525dbd)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 9525d1f Change line number printing label new 8525dbd Fix line number printing when option is disabled The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: mousepad/mousepad-print.c | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] 01/01: Change AM_CONFIG_HEADER to AC_CONFIG_HEADERS
This is an automated email from the git hooks/post-receive script. mbrush pushed a commit to branch master in repository apps/mousepad. commit a34472e50d5e05b59a8e7b46187d6a1820c6 Author: Matthew Brush mbr...@codebrainz.ca Date: Fri Jul 11 21:24:18 2014 -0700 Change AM_CONFIG_HEADER to AC_CONFIG_HEADERS Closes #9939 (https://bugzilla.xfce.org/show_bug.cgi?id=9939) --- configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 412b96f..673d45a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -29,7 +29,7 @@ dnl *** dnl *** Initialize automake *** dnl *** AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/mousepad] branch master updated (8525dbd - a34472e)
This is an automated email from the git hooks/post-receive script. mbrush pushed a change to branch master in repository apps/mousepad. from 8525dbd Fix line number printing when option is disabled new a34472e Change AM_CONFIG_HEADER to AC_CONFIG_HEADERS The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
