diff -Nru guake-0.8.7/configure.ac guake-0.8.8/configure.ac --- guake-0.8.7/configure.ac 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/configure.ac 2016-11-28 16:03:19.000000000 +0000 @@ -15,7 +15,7 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -AC_INIT([guake], [0.8.7], [http://guake-project.org/]) +AC_INIT([guake], [0.8.8], [http://guake-project.org/]) AC_CONFIG_HEADERS([config.h]) diff -Nru guake-0.8.7/data/pixmaps/Makefile.am guake-0.8.8/data/pixmaps/Makefile.am --- guake-0.8.7/data/pixmaps/Makefile.am 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/data/pixmaps/Makefile.am 2016-11-28 16:03:19.000000000 +0000 @@ -1,7 +1,6 @@ pixmapsdir = $(datadir)/pixmaps/guake pixmaps_DATA = \ guake.png \ - guake-tray.svg \ guake-tray.png \ guake-notification.png \ add_tab.png \ diff -Nru guake-0.8.7/debian/changelog guake-0.8.8/debian/changelog --- guake-0.8.7/debian/changelog 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/changelog 2016-12-17 17:55:53.000000000 +0000 @@ -1,3 +1,20 @@ +guake (0.8.8-1) unstable; urgency=medium + + * New upstream release. + * debian/control + + Change debhelper to 10 in B-D. + + Remove dh-autoreconf in B-D. + + Remove Provides field. (Closes: #848096) + * debian/compat: Switch compat level 9 to 10. + * debian/guake.postinst and debian/guake.prerm: Remove + update-alternatives logic. + * debian/rules + + Remove --with autoreconf dh10 brings it by default. + * debian/docs: Remove because the doc install from guakes.docs file + + + -- Daniel Echeverry Sat, 17 Dec 2016 12:55:53 -0500 + guake (0.8.7-1) unstable; urgency=medium * New upstream release. diff -Nru guake-0.8.7/debian/compat guake-0.8.8/debian/compat --- guake-0.8.7/debian/compat 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/compat 2016-12-17 17:55:53.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru guake-0.8.7/debian/control guake-0.8.8/debian/control --- guake-0.8.7/debian/control 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/control 2016-12-17 17:55:53.000000000 +0000 @@ -3,8 +3,7 @@ Priority: optional Maintainer: Daniel Echeverry Build-Depends: autoconf, - debhelper (>= 9), - dh-autoreconf, + debhelper (>= 10), dh-python, gconf2, intltool, @@ -40,7 +39,6 @@ ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Provides: x-terminal-emulator Description: Drop-down terminal for GNOME Desktop Environment Guake is a drop-down terminal for GNOME Desktop Environment, so you just need to press a key to invoke him, and press again to hide. diff -Nru guake-0.8.7/debian/docs guake-0.8.8/debian/docs --- guake-0.8.7/debian/docs 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -NEWS -README -TODO diff -Nru guake-0.8.7/debian/guake.postinst guake-0.8.8/debian/guake.postinst --- guake-0.8.7/debian/guake.postinst 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/guake.postinst 2016-12-17 17:55:53.000000000 +0000 @@ -5,10 +5,6 @@ case "$1" in configure) gconf-schemas --register /usr/share/gconf/schemas/guake.schemas > /dev/null - update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/guake 40 \ - --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ - x-terminal-emulator.1.gz /usr/share/man/man1/guake.1.gz ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru guake-0.8.7/debian/guake.prerm guake-0.8.8/debian/guake.prerm --- guake-0.8.7/debian/guake.prerm 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/guake.prerm 2016-12-17 17:55:53.000000000 +0000 @@ -4,8 +4,6 @@ case "$1" in remove|deconfigure) gconf-schemas --unregister guake.schemas - update-alternatives --remove guake /usr/bin/guake || true - update-alternatives --remove x-terminal-emulator /usr/bin/guake ;; diff -Nru guake-0.8.7/debian/rules guake-0.8.8/debian/rules --- guake-0.8.7/debian/rules 2016-08-22 03:50:32.000000000 +0000 +++ guake-0.8.8/debian/rules 2016-12-17 17:55:53.000000000 +0000 @@ -7,7 +7,7 @@ %: - dh $@ --with autoreconf,python2 + dh $@ --with python2 override_dh_clean: dh_clean diff -Nru guake-0.8.7/dev.sh guake-0.8.8/dev.sh --- guake-0.8.7/dev.sh 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/dev.sh 2016-11-28 16:03:19.000000000 +0000 @@ -4,16 +4,30 @@ # of Guake sources. Nothing say it will work directly on your environment. Use with caution! NO_INSTALL=true +RUN_TESTS=false +CREATE_ENV=true EXEC_AUTOGEN=false EXEC_UPDATE_PO=false echo "execute guake for developer." +echo "use --test to run tests" echo "use --install to install guake on your system" +echo "use --no-create-env to disable virtualenv creation" echo "(beware, gconf schema will be altered)" echo "use --reinstall to force complete reinstall" -echo "use --uninstall to force complete reinstall" +echo "use --uninstall to force complete uninstall" echo "use --update-po to force update translations" +ARGS=$* +if [[ `echo $ARGS | grep --regexp="--no-create-env"` ]]; then + CREATE_ENV=false +fi + +if [[ `echo $ARGS | grep --regexp="--test"` ]]; then + RUN_TESTS=true +fi + + if [[ $1 == "--install" ]]; then NO_INSTALL=false fi @@ -64,17 +78,32 @@ cd .. fi -if [[ $NO_INSTALL == true ]]; then +function make_virtualenv { + echo "Trying to prepare a virtualenv" if [[ ! -d env ]]; then virtualenv --system-site-packages env fi - echo "sourcing env" - source env/bin/activate - echo "Installing dev requirements" - pip install --upgrade -r python-requirements.txt + echo "sourcing env" && source env/bin/activate + echo "Installing dev requirements" && pip install --upgrade -r python-requirements.txt gconftool-2 --install-schema-file=data/guake.schemas - echo "Launching guake inside virtualenv" - PYTHONPATH=src python2.7 src/guake/main.py --no-startup-script +} + +# RUN TESTS or RUN GUAKE without installing it +if [[ $NO_INSTALL == true ]]; then + + if [[ $CREATE_ENV == true ]]; then + make_virtualenv + fi + echo "sourcing env" && source env/bin/activate + + if [[ $RUN_TESTS == true ]]; then + echo "running tests.." + PYTHONPATH=src env/bin/py.test src/guake/tests + else + echo "Launching guake inside virtualenv" + PYTHONPATH=src python2.7 src/guake/main.py --no-startup-script + fi + else sudo make install && gconftool-2 --install-schema-file=/usr/local/etc/gconf/schemas/guake.schemas || exit 1 diff -Nru guake-0.8.7/NEWS guake-0.8.8/NEWS --- guake-0.8.7/NEWS 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/NEWS 2016-11-28 16:03:19.000000000 +0000 @@ -1,3 +1,25 @@ + +Version 0.8.8 +============= + +Thank to these contribution from Guake users, I am happy to announce a new minor fix release of +Guake. + +Features: +* Close a tab with the middle button of the mouse + +Bug Fixes: +- Fix error when toggle key was disabled +- Update change news +- Uppercase pallete name +- Fix pylint errors +- Convert README badge to SVG +- Update Japanese translation +- update Russian translation +- updated CS translation +- Update zh_CN translation + + Version 0.8.7 ============= diff -Nru guake-0.8.7/po/cs.po guake-0.8.8/po/cs.po --- guake-0.8.7/po/cs.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/cs.po 2016-11-28 16:03:19.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # Martin Lukeš , 2011 +# Daniel Milde , 2016 msgid "" msgstr "" "Project-Id-Version: Guake 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" -"PO-Revision-Date: 2016-05-25 22:08+0200\n" -"Last-Translator: Martin Lukeš \n" +"PO-Revision-Date: 2016-10-11 11:45+0200\n" +"Last-Translator: Daniel Milde \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/" "guake/language/cs_CZ/)\n" "Language: cs_CZ\n" @@ -274,11 +275,11 @@ #: ../data/prefs.glade.h:34 msgid "0 means no size limit" -msgstr "" +msgstr "0 znamená žádný limit velikosti" #: ../data/prefs.glade.h:35 msgid "Abbreviate directories in tab names" -msgstr "" +msgstr "Zkrátit jména složek v názvech tabů" #: ../data/prefs.glade.h:36 msgid "Hide on lose focus" @@ -667,9 +668,8 @@ msgstr "Vyhledat na webu (bez výběru)" #: ../src/guake/guake_app.py:683 -#, fuzzy msgid "Open Link: '{}...'" -msgstr "Otevřít odkaz: {}" +msgstr "Otevřít odkaz: '{}...'" #: ../src/guake/guake_app.py:685 msgid "Open Link: {}" @@ -803,7 +803,6 @@ msgstr "Přepnout viditelnost Guake" #: ../src/guake/prefs.py:81 -#, fuzzy msgid "Toggle Hide on Lose Focus" msgstr "Skrýt při ztrátě aktivity okna" @@ -812,7 +811,6 @@ msgstr "Správa karet" #: ../src/guake/prefs.py:90 -#, fuzzy msgid "New tab" msgstr "Nová karta" @@ -837,104 +835,88 @@ msgstr "Přejít na následující kartu" #: ../src/guake/prefs.py:103 -#, fuzzy msgid "Move current tab left" -msgstr "Přejmenovat současnou kartu" +msgstr "Přesunout současnou kartu vlevo" #: ../src/guake/prefs.py:105 -#, fuzzy msgid "Move current tab right" -msgstr "Přejmenovat současnou kartu" +msgstr "Přesunout současnou kartu vpravo" #: ../src/guake/prefs.py:107 -#, fuzzy msgid "Go to first tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na první kartu" #: ../src/guake/prefs.py:109 -#, fuzzy msgid "Go to second tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na druhou kartu" #: ../src/guake/prefs.py:111 -#, fuzzy msgid "Go to third tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na třetí kartu" #: ../src/guake/prefs.py:113 -#, fuzzy msgid "Go to fourth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na čtvrtou kartu" #: ../src/guake/prefs.py:115 -#, fuzzy msgid "Go to fifth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na pátou kartu" #: ../src/guake/prefs.py:117 -#, fuzzy msgid "Go to sixth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na šestou kartu" #: ../src/guake/prefs.py:119 -#, fuzzy msgid "Go to seventh tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na sedmou kartu" #: ../src/guake/prefs.py:121 -#, fuzzy msgid "Go to eighth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na osmou kartu" #: ../src/guake/prefs.py:123 -#, fuzzy msgid "Go to ninth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na devátou kartu" #: ../src/guake/prefs.py:125 -#, fuzzy msgid "Go to tenth tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na desátou kartu" #: ../src/guake/prefs.py:127 -#, fuzzy msgid "Go to last tab" -msgstr "Přejít na následující kartu" +msgstr "Přejít na poslední kartu" #: ../src/guake/prefs.py:132 msgid "Zoom out" -msgstr "" +msgstr "Oddálit" #: ../src/guake/prefs.py:134 msgid "Zoom in" -msgstr "" +msgstr "Přiblížit" #: ../src/guake/prefs.py:136 msgid "Zoom in (alternative)" -msgstr "" +msgstr "Přiblížit (alternativa)" #: ../src/guake/prefs.py:138 msgid "Increase height" -msgstr "" +msgstr "Zvětšit výšku" #: ../src/guake/prefs.py:140 msgid "Decrease height" -msgstr "" +msgstr "Snížit výšku" #: ../src/guake/prefs.py:142 -#, fuzzy msgid "Increase transparency" -msgstr "Průhlednost:" +msgstr "Zvýšit průhlednost" #: ../src/guake/prefs.py:144 -#, fuzzy msgid "Decrease transparency" -msgstr "Průhlednost:" +msgstr "Snížit průhlednost" #: ../src/guake/prefs.py:146 -#, fuzzy msgid "Toggle transparency" -msgstr "Průhlednost:" +msgstr "Přepnout průhlednost" #: ../src/guake/prefs.py:149 msgid "Clipboard" @@ -950,12 +932,11 @@ #: ../src/guake/prefs.py:156 msgid "Extra features" -msgstr "" +msgstr "Další funkce" #: ../src/guake/prefs.py:159 -#, fuzzy msgid "Search select text on web" -msgstr "Najít na webu" +msgstr "Najít vybraný text na webu" #: ../src/guake/prefs.py:481 msgid "Action" diff -Nru guake-0.8.7/po/fr.po guake-0.8.8/po/fr.po --- guake-0.8.7/po/fr.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/fr.po 2016-11-28 16:03:19.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: Guake 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" -"PO-Revision-Date: 2016-08-18 17:37+0200\n" -"Last-Translator: Benjamin Danon \n" +"PO-Revision-Date: 2016-10-09 03:08+0200\n" +"Last-Translator: Gaetan \n" "Language-Team: French (http://www.transifex.com/projects/p/guake/language/" "fr/)\n" "Language: fr\n" @@ -22,7 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.9\n" #: ../data/about.glade.h:1 msgid "About Guake" @@ -603,7 +603,7 @@ #: ../src/guake/gconfhandler.py:369 ../src/guake/guake_app.py:1386 msgid "Terminal" -msgstr "Terminal %s" +msgstr "Terminal" #: ../src/guake/gconfhandler.py:440 #, python-format diff -Nru guake-0.8.7/po/ja.po guake-0.8.8/po/ja.po --- guake-0.8.7/po/ja.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/ja.po 2016-11-28 16:03:19.000000000 +0000 @@ -1,38 +1,40 @@ # Japanese translation of the Guake software -# Copyright (C) 2013 Guake Translators +# Copyright (C) 2008-2016 Guake Translators # This file is distributed under the same license as the Guake package. # # Translators: # Nishio Futoshi , 2008, 2010. +# IWAI, Masaharu , 2016. +# msgid "" msgstr "" -"Project-Id-Version: Guake 0.4.5\n" +"Project-Id-Version: Guake 0.8.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" -"PO-Revision-Date: 2010-07-24 14:58+0900\n" -"Last-Translator: Nishio Futoshi \n" -"Language-Team: guake@lists.guake.org\n" -"Language: \n" +"PO-Revision-Date: 2016-11-27 23:23+0900\n" +"Last-Translator: IWAI, Masaharu \n" +"Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../data/about.glade.h:1 msgid "About Guake" msgstr "Guakeについて" #: ../data/about.glade.h:2 -#, fuzzy msgid "" "Copyright 2013-2015 Gaetan Semet\n" "Copyright 2007-2010 Lincoln de Sousa\n" "Copyright 2007 Gabriel Falcão" msgstr "" -"Copyright 2007-2009 Lincoln de Sousa\n" +"Copyright 2013-2015 Gaetan Semet\n" +"Copyright 2007-2010 Lincoln de Sousa\n" "Copyright 2007 Gabriel Falcão" #: ../data/about.glade.h:5 -#, fuzzy msgid "" "Guake is an easy to access\n" "terminal based on FPS games terminal" @@ -108,7 +110,6 @@ msgstr "新規TAB" #: ../data/guake.glade.h:8 -#, fuzzy msgid "Rename Tab" msgstr "タブの名前を変更" @@ -141,9 +142,8 @@ msgstr "Guake!" #: ../data/guake.glade.h:16 -#, fuzzy msgid "Add a new tab" -msgstr "新しいタブ" +msgstr "新しいタブを追加" #: ../data/prefs.glade.h:1 msgid "Guake Preferences" @@ -267,9 +267,8 @@ msgstr "タブバーを表示する" #: ../data/prefs.glade.h:38 -#, fuzzy msgid "Start fullscreen" -msgstr "全画面表示" +msgstr "全画面表示で開始" #: ../data/prefs.glade.h:39 msgid "Main Window" @@ -293,14 +292,12 @@ msgstr "ウィンドウサイズ" #: ../data/prefs.glade.h:44 -#, fuzzy msgid "Main Window Height" msgstr "メインウィンドウの高さ" #: ../data/prefs.glade.h:45 -#, fuzzy msgid "Main Window Width" -msgstr "メインウィンドウの高さ" +msgstr "メインウィンドウの幅" #: ../data/prefs.glade.h:46 msgid "Custom command file path: " @@ -417,12 +414,10 @@ msgstr "色:" #: ../data/prefs.glade.h:77 -#, fuzzy msgid "Font color" msgstr "文字の色:" #: ../data/prefs.glade.h:78 -#, fuzzy msgid "Background color" msgstr "背景色" @@ -555,9 +550,8 @@ msgstr "Guake 端末" #: ../src/guake/gconfhandler.py:369 ../src/guake/guake_app.py:1386 -#, fuzzy msgid "Terminal" -msgstr "端末 %s" +msgstr "端末" #: ../src/guake/gconfhandler.py:440 #, python-format @@ -569,12 +563,10 @@ "設定画面で別のキーを選択してください。(通知エリアのアイコンが有効でした)" #: ../src/guake/guake_app.py:132 -#, fuzzy msgid "Do you want to close the tab?" -msgstr "本当に Guake を終了しますか?" +msgstr "タブを閉じますか?" #: ../src/guake/guake_app.py:135 -#, fuzzy msgid "Do you really want to quit Guake?" msgstr "本当に Guake を終了しますか?" @@ -589,19 +581,17 @@ msgstr "" #: ../src/guake/guake_app.py:142 -#, fuzzy msgid "There are no processes running" -msgstr "1つのプロセスが実行中です" +msgstr "実行中のプロセスはありません" #: ../src/guake/guake_app.py:144 -#, fuzzy msgid "There is a process still running" -msgstr "1つのプロセスが実行中です" +msgstr "まだ、1つのプロセスが実行中です" #: ../src/guake/guake_app.py:146 -#, fuzzy, python-brace-format +#, python-brace-format msgid "There are {0} processes still running" -msgstr "%dつのプロセスが実行中です" +msgstr "まだ %dつのプロセスが実行中です" #: ../src/guake/guake_app.py:186 msgid "guake-indicator" @@ -682,14 +672,12 @@ msgstr "端末の表示を変更します" #: ../src/guake/main.py:76 -#, fuzzy msgid "Shows Guake main window" -msgstr "Guakeの設定画面を表示します" +msgstr "Guakeのメインウインドウを表示します" #: ../src/guake/main.py:80 -#, fuzzy msgid "Hides Guake main window" -msgstr "Guakeの設定画面を表示します" +msgstr "Guakeのメインウインドウを隠します" #: ../src/guake/main.py:84 msgid "Shows Guake preference window" @@ -700,9 +688,8 @@ msgstr "Guakeの情報を表示します" #: ../src/guake/main.py:92 -#, fuzzy msgid "Add a new tab (with current directory set to NEW_TAB)" -msgstr "カレントディレクトリを新しいタブに開く(_O)" +msgstr "カレントディレクトリを新しいタブに開く" #: ../src/guake/main.py:96 msgid "Select a tab (SELECT_TAB is the index of the tab)" @@ -751,7 +738,6 @@ msgstr "Guakeを初期化できません" #: ../src/guake/main.py:236 -#, fuzzy msgid "" "Gconf Error.\n" "Have you installed guake.schemas properly?" @@ -769,7 +755,6 @@ msgstr "端末表示の切り替え" #: ../src/guake/prefs.py:81 -#, fuzzy msgid "Toggle Hide on Lose Focus" msgstr "フォーカスを失ったら隠す" @@ -778,9 +763,8 @@ msgstr "タブの管理" #: ../src/guake/prefs.py:90 -#, fuzzy msgid "New tab" -msgstr "新規TAB" +msgstr "新規タブ" #: ../src/guake/prefs.py:92 msgid "Close tab" @@ -803,77 +787,64 @@ msgstr "次のタブに移動" #: ../src/guake/prefs.py:103 -#, fuzzy msgid "Move current tab left" -msgstr "現在のタブの名前を変更" +msgstr "現在のタブを左に移動" #: ../src/guake/prefs.py:105 -#, fuzzy msgid "Move current tab right" -msgstr "現在のタブの名前を変更" +msgstr "現在のタブの名前を右に移動" #: ../src/guake/prefs.py:107 -#, fuzzy msgid "Go to first tab" -msgstr "次のタブに移動" +msgstr "最初のタブに移動" #: ../src/guake/prefs.py:109 -#, fuzzy msgid "Go to second tab" -msgstr "次のタブに移動" +msgstr "2つめのタブに移動" #: ../src/guake/prefs.py:111 -#, fuzzy msgid "Go to third tab" -msgstr "次のタブに移動" +msgstr "3つめタブに移動" #: ../src/guake/prefs.py:113 -#, fuzzy msgid "Go to fourth tab" -msgstr "次のタブに移動" +msgstr "4つめタブに移動" #: ../src/guake/prefs.py:115 -#, fuzzy msgid "Go to fifth tab" -msgstr "次のタブに移動" +msgstr "5つめのタブに移動" #: ../src/guake/prefs.py:117 -#, fuzzy msgid "Go to sixth tab" -msgstr "次のタブに移動" +msgstr "6つめのタブに移動" #: ../src/guake/prefs.py:119 -#, fuzzy msgid "Go to seventh tab" -msgstr "次のタブに移動" +msgstr "7つめのタブに移動" #: ../src/guake/prefs.py:121 -#, fuzzy msgid "Go to eighth tab" -msgstr "次のタブに移動" +msgstr "8つめのタブに移動" #: ../src/guake/prefs.py:123 -#, fuzzy msgid "Go to ninth tab" -msgstr "次のタブに移動" +msgstr "9つめのタブに移動" #: ../src/guake/prefs.py:125 -#, fuzzy msgid "Go to tenth tab" -msgstr "次のタブに移動" +msgstr "10個目のタブに移動" #: ../src/guake/prefs.py:127 -#, fuzzy msgid "Go to last tab" -msgstr "次のタブに移動" +msgstr "最後のタブに移動" #: ../src/guake/prefs.py:132 msgid "Zoom out" -msgstr "" +msgstr "縮小" #: ../src/guake/prefs.py:134 msgid "Zoom in" -msgstr "" +msgstr "拡大" #: ../src/guake/prefs.py:136 msgid "Zoom in (alternative)" diff -Nru guake-0.8.7/po/nl.po guake-0.8.8/po/nl.po --- guake-0.8.7/po/nl.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/nl.po 2016-11-28 16:03:19.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: Guake 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" -"PO-Revision-Date: 2011-03-22 15:26+0000\n" -"Last-Translator: Robert van Drunen \n" +"PO-Revision-Date: 2016-10-09 03:09+0200\n" +"Last-Translator: Gaetan \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/guake/language/" "nl/)\n" "Language: nl\n" @@ -18,6 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.9\n" #: ../data/about.glade.h:1 msgid "About Guake" @@ -573,9 +574,8 @@ msgstr "Guake Terminal" #: ../src/guake/gconfhandler.py:369 ../src/guake/guake_app.py:1386 -#, fuzzy msgid "Terminal" -msgstr "Terminal %s" +msgstr "Terminal" #: ../src/guake/gconfhandler.py:440 #, python-format diff -Nru guake-0.8.7/po/ru.po guake-0.8.8/po/ru.po --- guake-0.8.7/po/ru.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/ru.po 2016-11-28 16:03:19.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: Guake 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" -"PO-Revision-Date: 2016-08-05 15:34+0300\n" +"PO-Revision-Date: 2016-11-26 18:47+0300\n" "Last-Translator: Ivan Komaritsyn \n" "Language: \n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ #: ../data/prefs.glade.h:34 msgid "0 means no size limit" -msgstr "" +msgstr "0 - без ограничения размера" #: ../data/prefs.glade.h:35 msgid "Abbreviate directories in tab names" @@ -887,7 +887,7 @@ #: ../src/guake/prefs.py:136 msgid "Zoom in (alternative)" -msgstr "Учеличить (альтернативная)" +msgstr "Увеличить (альтернативная)" #: ../src/guake/prefs.py:138 msgid "Increase height" diff -Nru guake-0.8.7/po/zh_CN.po guake-0.8.8/po/zh_CN.po --- guake-0.8.7/po/zh_CN.po 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/po/zh_CN.po 2016-11-28 16:03:19.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # 甘露(Gan Lu) , 2010. +# 吴新宇(Xinyu Ng) , 2016. msgid "" msgstr "" "Project-Id-Version: Guake 0.4.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-18 17:32+0200\n" "PO-Revision-Date: \n" -"Last-Translator: 甘露(Gan Lu) \n" +"Last-Translator: 吴新宇(Xinyu Ng) \n" "Language-Team: guake@lists.guake.org\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -104,9 +105,8 @@ msgstr "保存到文件" #: ../data/guake.glade.h:5 ../src/guake/prefs.py:85 -#, fuzzy msgid "Reset terminal" -msgstr "Guake 终端" +msgstr "重置终端" #: ../data/guake.glade.h:6 msgid "Find..." @@ -555,7 +555,7 @@ #: ../src/guake/gconfhandler.py:369 ../src/guake/guake_app.py:1386 msgid "Terminal" -msgstr "终端 %s" +msgstr "终端" #: ../src/guake/gconfhandler.py:440 #, python-format @@ -585,16 +585,16 @@ #: ../src/guake/guake_app.py:142 msgid "There are no processes running" -msgstr "有一个进程仍然在运行" +msgstr "没有进程仍然在运行" #: ../src/guake/guake_app.py:144 msgid "There is a process still running" msgstr "有一个进程仍然在运行" #: ../src/guake/guake_app.py:146 -#, fuzzy, python-brace-format +#, python-brace-format msgid "There are {0} processes still running" -msgstr "有 %d 进程正在运行" +msgstr "有 {0} 进程正在运行" #: ../src/guake/guake_app.py:186 msgid "guake-indicator" @@ -627,9 +627,8 @@ msgstr "在网络上搜索（没有选择文字）" #: ../src/guake/guake_app.py:683 -#, fuzzy msgid "Open Link: '{}...'" -msgstr "打开链接：{}" +msgstr "打开链接：'{}...'" #: ../src/guake/guake_app.py:685 msgid "Open Link: {}" @@ -759,7 +758,6 @@ msgstr "切换 Guake 是否可见" #: ../src/guake/prefs.py:81 -#, fuzzy msgid "Toggle Hide on Lose Focus" msgstr "失去焦点后隐藏" @@ -768,7 +766,6 @@ msgstr "标签页管理" #: ../src/guake/prefs.py:90 -#, fuzzy msgid "New tab" msgstr "新标签页" @@ -793,104 +790,88 @@ msgstr "下一个标签页" #: ../src/guake/prefs.py:103 -#, fuzzy msgid "Move current tab left" -msgstr "重命名当前标签页" +msgstr "将当前标签页向左移动" #: ../src/guake/prefs.py:105 -#, fuzzy msgid "Move current tab right" -msgstr "重命名当前标签页" +msgstr "将当前标签页向右移动" #: ../src/guake/prefs.py:107 -#, fuzzy msgid "Go to first tab" -msgstr "下一个标签页" +msgstr "跳转到第一个标签页" #: ../src/guake/prefs.py:109 -#, fuzzy msgid "Go to second tab" -msgstr "下一个标签页" +msgstr "跳转到第二个标签页" #: ../src/guake/prefs.py:111 -#, fuzzy msgid "Go to third tab" -msgstr "下一个标签页" +msgstr "跳转到第三个标签页" #: ../src/guake/prefs.py:113 -#, fuzzy msgid "Go to fourth tab" -msgstr "下一个标签页" +msgstr "跳转到第四个标签页" #: ../src/guake/prefs.py:115 -#, fuzzy msgid "Go to fifth tab" -msgstr "下一个标签页" +msgstr "跳转到第五个标签页" #: ../src/guake/prefs.py:117 -#, fuzzy msgid "Go to sixth tab" -msgstr "下一个标签页" +msgstr "跳转到第六个标签页" #: ../src/guake/prefs.py:119 -#, fuzzy msgid "Go to seventh tab" -msgstr "下一个标签页" +msgstr "跳转到第七个标签页" #: ../src/guake/prefs.py:121 -#, fuzzy msgid "Go to eighth tab" -msgstr "下一个标签页" +msgstr "跳转到第八个标签页" #: ../src/guake/prefs.py:123 -#, fuzzy msgid "Go to ninth tab" -msgstr "下一个标签页" +msgstr "跳转到第九个标签页" #: ../src/guake/prefs.py:125 -#, fuzzy msgid "Go to tenth tab" -msgstr "下一个标签页" +msgstr "跳转到第十个标签页" #: ../src/guake/prefs.py:127 -#, fuzzy msgid "Go to last tab" -msgstr "下一个标签页" +msgstr "跳转到最后一个标签页" #: ../src/guake/prefs.py:132 msgid "Zoom out" -msgstr "" +msgstr "放大" #: ../src/guake/prefs.py:134 msgid "Zoom in" -msgstr "" +msgstr "缩小" #: ../src/guake/prefs.py:136 msgid "Zoom in (alternative)" -msgstr "" +msgstr "缩小（替代）" #: ../src/guake/prefs.py:138 msgid "Increase height" -msgstr "" +msgstr "增加高度" #: ../src/guake/prefs.py:140 msgid "Decrease height" -msgstr "" +msgstr "减少高度" #: ../src/guake/prefs.py:142 -#, fuzzy msgid "Increase transparency" -msgstr "透明：" +msgstr "增加透明度" #: ../src/guake/prefs.py:144 -#, fuzzy msgid "Decrease transparency" -msgstr "透明：" +msgstr "减少透明度" #: ../src/guake/prefs.py:146 -#, fuzzy msgid "Toggle transparency" -msgstr "透明：" +msgstr "透明开关" #: ../src/guake/prefs.py:149 msgid "Clipboard" @@ -909,9 +890,8 @@ msgstr "" #: ../src/guake/prefs.py:159 -#, fuzzy msgid "Search select text on web" -msgstr "使用搜索引擎搜索" +msgstr "使用搜索引擎搜索选择文字" #: ../src/guake/prefs.py:481 msgid "Action" diff -Nru guake-0.8.7/pylintrc guake-0.8.8/pylintrc --- guake-0.8.7/pylintrc 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/pylintrc 2016-11-28 16:03:19.000000000 +0000 @@ -77,6 +77,8 @@ C0322, C0323, C0324, + C0411, + C0413, C1001, E0202, E0611, diff -Nru guake-0.8.7/python-requirements.in guake-0.8.8/python-requirements.in --- guake-0.8.7/python-requirements.in 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/python-requirements.in 2016-11-28 16:03:19.000000000 +0000 @@ -4,3 +4,5 @@ autopep8 >= 1.2.2 pyflakes >= 1.1.0 pip-tools +pytest +mock diff -Nru guake-0.8.7/python-requirements.txt guake-0.8.8/python-requirements.txt --- guake-0.8.7/python-requirements.txt 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/python-requirements.txt 2016-11-28 16:03:19.000000000 +0000 @@ -14,6 +14,8 @@ pyflakes==1.1.0 pylint==1.4.3 six==1.10.0 # via astroid, logilab-common, pip-tools, pylint +mock==2.0.0 +pytest==3.0.1 # The following packages are commented out because they are # considered to be unsafe in a requirements file: diff -Nru guake-0.8.7/README.rst guake-0.8.8/README.rst --- guake-0.8.7/README.rst 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/README.rst 2016-11-28 16:03:19.000000000 +0000 @@ -4,7 +4,7 @@ |travis-badge|_ -.. |travis-badge| image:: https://travis-ci.org/Guake/guake.png?branch=master +.. |travis-badge| image:: https://travis-ci.org/Guake/guake.svg?branch=master .. _travis-badge: https://travis-ci.org/Guake/guake @@ -151,15 +151,14 @@ RedHat/Fedora ------------- -For Fedora 19 and above, Guake is available in the official repositories and can be installed by -running:: +Guake is available in the official repositories: - sudo yum install guake # for Fedora 19 - 21 - sudo dnf install guake # for Fedora 23 and above + sudo yum install guake # for Fedora 19 - 21 + sudo dnf install guake # for Fedora 23 and above -For compiling from these sources, please install the following packages (Fedora 19):: +If compiling from source, please install dependencies: - TBD + sudo dnf builddep guake ArchLinux --------- @@ -229,7 +228,7 @@ $ ./configure --sysconfdir=/etc && make -If it is not enought you can install the gconf schemas file by hand by doing the following:: +If it is not enough you can install the gconf schemas file by hand by doing the following:: $ GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule data/guake.schemas diff -Nru guake-0.8.7/src/guake/dbusiface.py guake-0.8.8/src/guake/dbusiface.py --- guake-0.8.7/src/guake/dbusiface.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/dbusiface.py 2016-11-28 16:03:19.000000000 +0000 @@ -81,6 +81,10 @@ return len(self.guake.notebook.term_list) @dbus.service.method(DBUS_NAME, in_signature='s') + def set_bg_image(self, bgcolor): + self.guake.set_bg_image(bgcolor) + + @dbus.service.method(DBUS_NAME, in_signature='s') def set_bgcolor(self, bgcolor): self.guake.set_bgcolor(bgcolor) diff -Nru guake-0.8.7/src/guake/gconfhandler.py guake-0.8.8/src/guake/gconfhandler.py --- guake-0.8.7/src/guake/gconfhandler.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/gconfhandler.py 2016-11-28 16:03:19.000000000 +0000 @@ -412,6 +412,10 @@ """ gkey = entry.get_key() key = entry.get_value().get_string() + + if key == 'disabled': + return + try: self.guake.hotkeys.unbind(self.globalhotkeys[gkey]) except KeyError: diff -Nru guake-0.8.7/src/guake/guake_app.py guake-0.8.8/src/guake/guake_app.py --- guake-0.8.7/src/guake/guake_app.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/guake_app.py 2016-11-28 16:03:19.000000000 +0000 @@ -174,8 +174,9 @@ self.custom_command_menuitem = None # trayicon! Using SVG handles better different OS trays - img = pixmapfile('guake-tray.svg') - + # img = pixmapfile('guake-tray.svg') + # trayicon! + img = pixmapfile('guake-tray.png') try: import appindicator except ImportError: @@ -528,6 +529,16 @@ else: t.set_background_transparent(True) + def set_bg_image(self, image, tab=None): + """Set the background image of `tab' or the current tab to `bgcolor'.""" + if not self.notebook.has_term(): + self.add_tab() + index = tab or self.notebook.get_current_page() + for terminal in self.notebook.get_terminals_for_tab(index): + if image and os.path.exists(image): + terminal.set_background_image_file(image) + terminal.set_background_transparent(False) + def set_bgcolor(self, bgcolor, tab=None): """Set the background color of `tab' or the current tab to `bgcolor'.""" if not self.notebook.has_term(): @@ -717,6 +728,16 @@ menu.popup(None, None, None, 3, event.get_time()) self.set_terminal_focus() + def middle_button_click(self, target, event): + """Closes a tab with a middle click + """ + if event.button == 2 and event.type == gtk.gdk.BUTTON_PRESS: + previously_selected_tab = self.get_selected_tab() + target.activate_tab() + target_position = self.get_selected_tab() + self.select_tab(previously_selected_tab) + self.delete_tab(target_position) + def show_about(self, *args): """Hides the main window and creates an instance of the About Dialog. @@ -828,8 +849,21 @@ if not self.notebook.has_term(): self.add_tab() + try: + # does it work in other gtk backends + time = gtk.gdk.x11_get_server_time(self.window.window) + except: + time = 0 + self.window.set_keep_below(False) + self.printDebug("order to present and deiconify") + self.window.present() + self.window.deiconify() + self.window.window.deiconify() self.window.show_all() + self.window.window.focus(time) + self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK) + self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL) if self.selected_color is None: self.selected_color = getattr(self.window.get_style(), "light")[int(gtk.STATE_SELECTED)] @@ -849,12 +883,6 @@ if not self.is_fullscreen: self.client.notify(KEY('/general/window_height')) - try: - # does it work in other gtk backends - time = gtk.gdk.x11_get_server_time(self.window.window) - except AttributeError: - time = 0 - # When minized, the window manager seems to refuse to resume # log.debug("self.window: %s. Dir=%s", type(self.window), dir(self.window)) # is_iconified = self.is_iconified() @@ -874,15 +902,6 @@ # glib.timeout_add_seconds(1, lambda: self.timeout_restore(time)) # - self.printDebug("order to present and deiconify") - self.window.present() - self.window.deiconify() - self.window.window.deiconify() - self.window.window.show() - self.window.window.focus(time) - self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK) - self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL) - # log.debug("Restoring skip_taskbar_hint and skip_pager_hint") # if is_iconified: # self.get_widget('window-root').set_skip_taskbar_hint(False) @@ -1392,7 +1411,7 @@ current_directory = vte.get_current_directory() if self.abbreviate and vte_title.endswith(current_directory): parts = current_directory.split('/') - parts = list(map(lambda s: s[:1], parts[:-1])) + [parts[-1]] + parts = [s[:1] for s in parts[:-1]] + [parts[-1]] vte_title = vte_title[:len(vte_title) - len(current_directory)] + '/'.join(parts) except OSError: pass @@ -1535,6 +1554,8 @@ else: tab.set_label(new_text) setattr(tab, 'custom_label_set', new_text != "-") + if new_text != "-": + setattr(self.selected_tab, 'custom_label_text', new_text) terminals = self.notebook.get_terminals_for_tab(tab_index) for current_vte in terminals: current_vte.emit('window-title-changed') @@ -1549,6 +1570,8 @@ else: tab.set_label(new_text) setattr(tab, 'custom_label_set', new_text != "-") + if new_text != "-": + setattr(self.selected_tab, 'custom_label_text', new_text) terminals = self.notebook.get_terminals_for_tab(tab_index) for current_vte in terminals: current_vte.emit('window-title-changed') @@ -1557,6 +1580,7 @@ """Sets the `self.selected_tab' var with the selected radio button and change its label to `new_text'. """ + pagepos = self.notebook.get_current_page() self.selected_tab = self.tabs.get_children()[pagepos] self.selected_tab.set_label(new_text) @@ -1564,6 +1588,8 @@ # it's hard to pass an empty string as a command line argument, # so we'll interpret single dash "-" as a "reset custom title" request setattr(self.selected_tab, 'custom_label_set', new_text != "-") + if new_text != "-": + setattr(self.selected_tab, 'custom_label_text', new_text) # trigger titling handler in case that custom label has been reset current_vte = self.notebook.get_current_terminal() @@ -1703,10 +1729,12 @@ bnt.set_property('can-focus', False) bnt.set_property('draw-indicator', False) bnt.connect('button-press-event', self.show_tab_menu) - bnt.connect('button-press-event', self.show_rename_current_tab_dialog) - bnt.connect('clicked', lambda *x: self.notebook.set_current_page( + bnt.activate_tab = lambda *x: self.notebook.set_current_page( self.notebook.page_num(box) - )) + ) + bnt.connect('button-press-event', self.middle_button_click) + bnt.connect('button-press-event', self.show_rename_current_tab_dialog) + bnt.connect('clicked', bnt.activate_tab) if self.selected_color is not None: bnt.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.Color( str(self.selected_color))) @@ -1720,10 +1748,14 @@ self.tabs.pack_start(bnt, expand=False, padding=1) self.notebook.append_page(box, None) - self.notebook.set_current_page(self.notebook.page_num(box)) + bnt.activate_tab() box.terminal.grab_focus() self.load_config() + for tab in self.tabs: + if getattr(tab, 'custom_label_set', False): + tab.set_label(getattr(tab, 'custom_label_text', tab.get_label())) + if self.is_fullscreen: self.fullscreen() @@ -1858,6 +1890,10 @@ self.abbreviate = False self.recompute_tabs_titles() + for tab in self.tabs: + if getattr(tab, 'custom_label_set', False): + tab.set_label(getattr(tab, 'custom_label_text', tab.get_label())) + def set_terminal_focus(self): """Grabs the focus on the current tab. """ diff -Nru guake-0.8.7/src/guake/main.py guake-0.8.8/src/guake/main.py --- guake-0.8.7/src/guake/main.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/main.py 2016-11-28 16:03:19.000000000 +0000 @@ -41,6 +41,7 @@ from guake.dbusiface import DBUS_PATH from guake.dbusiface import DbusManager from guake.globals import KEY +from guake.globals import VERSION from guake.guake_app import Guake @@ -62,7 +63,7 @@ # Force to xterm-256 colors for compatibility with some old command line programs os.environ["TERM"] = "xterm-256color" - parser = OptionParser() + parser = OptionParser(version='Guake Terminal %s' % VERSION) parser.add_option('-f', '--fullscreen', dest='fullscreen', action='store_true', default=False, help=_('Put Guake in fullscreen mode')) @@ -107,6 +108,11 @@ action='store', default='0', help=_('Specify the tab to rename. Default is 0.')) + parser.add_option('--bgimg', dest='bgimg', + action='store', default='', + help=_('Set the background image of ' + 'the selected tab.')) + parser.add_option('--bgcolor', dest='bgcolor', action='store', default='', help=_('Set the hexadecimal (#rrggbb) background color of ' @@ -195,6 +201,10 @@ remote_object.rename_tab(int(options.tab_index), options.rename_tab) only_show_hide = False + if options.bgimg: + remote_object.set_bg_image(options.bgimg) + only_show_hide = False + if options.bgcolor: remote_object.set_bgcolor(options.bgcolor) only_show_hide = False diff -Nru guake-0.8.7/src/guake/palettes.py guake-0.8.8/src/guake/palettes.py --- guake-0.8.7/src/guake/palettes.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/palettes.py 2016-11-28 16:03:19.000000000 +0000 @@ -185,6 +185,12 @@ '#6060E0E06F6F:#D6D698982727:#7878D8D8D8D8:#CDCD7C7C5353:#5858D5D59898:' '#FFFFF1F1E8E8:#808079797373:#212121211C1C' ), + 'Elementary Loki': ( + '#070736364242:#DCDC32322F2F:#858599990000:#B5B589890000:#26268B8BD2D2:' + '#ECEC00004848:#2A2AA1A19898:#9494A3A3A5A5:#58586E6E7575:#CBCB4B4B1616:' + '#858599990000:#B5B589890000:#26268B8BD2D2:#D3D336368282:#2A2AA1A19898:' + '#EEEEEEEEEEEE:#9494A3A3A5A5:#25252E2E3232' + ), 'Espresso Libre': ( '#000000000000:#CCCC00000000:#1A1A92921C1C:#EFEFE4E43A3A:#00006666FFFF:' '#C5C565656B6B:#050598989A9A:#D3D3D7D7CFCF:#545457575353:#EFEF28282828:' diff -Nru guake-0.8.7/src/guake/prefs.py guake-0.8.8/src/guake/prefs.py --- guake-0.8.7/src/guake/prefs.py 2016-08-22 14:07:11.000000000 +0000 +++ guake-0.8.8/src/guake/prefs.py 2016-11-28 16:03:19.000000000 +0000 @@ -689,8 +689,8 @@ def fill_palette_names(self): combo = self.get_widget('palette_name') - for palette_name in sorted(PALETTES.keys()): - combo.append_text(palette_name) + for palette in sorted(PALETTES): + combo.append_text(palette) self.custom_palette_index = len(PALETTES) combo.append_text(_('Custom'))