Merge branch 'master' of github.com:artemanufrij/webpin

This commit is contained in:
Artem Anufrij 2017-11-08 23:13:29 +01:00
commit 528e9d17c0
5 changed files with 123 additions and 94 deletions

View file

@ -31,4 +31,18 @@
<image>https://raw.githubusercontent.com/artemanufrij/webpin/master/Screenshot_new_app.png</image> <image>https://raw.githubusercontent.com/artemanufrij/webpin/master/Screenshot_new_app.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<releases>
<release version="0.1.9" date="2017-10-15">
<description>
<p>New:</p>
<ul>
<li>Copy current URI into clipboard</li>
</ul>
<p>Fix:</p>
<ul>
<li>Open WebApp on single click instead double click</li>
</ul>
</description>
</release>
</releases>
</component> </component>

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-09 21:07+0400\n" "POT-Creation-Date: 2017-10-15 19:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,24 +17,20 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ../src/WebWindow.vala:61 ../src/Widgets/Assistant.vala:118 #: ../src/Dialogs/InfoDialog.vala:44
msgid "Accept"
msgstr ""
#: ../src/WebWindow.vala:53
msgid "Copy URI into clipboard"
msgstr ""
#: ../src/WebWindow.vala:65 ../src/Widgets/Assistant.vala:118
msgid "Run in background when closed" msgid "Run in background when closed"
msgstr "" msgstr ""
#: ../src/WebWindow.vala:73 ../src/WebWindow.vala:83 #: ../src/WebWindow.vala:115
msgid "Unmute notifications" msgid "Open %s"
msgstr ""
#: ../src/WebWindow.vala:76 ../src/WebWindow.vala:86
msgid "Mute notifications"
msgstr ""
#: ../src/WebWindow.vala:88
msgid "Desktop notifications are enabled"
msgstr ""
#: ../src/Dialogs/InfoDialog.vala:44
msgid "Accept"
msgstr "" msgstr ""
#: ../src/MainWindow.vala:56 #: ../src/MainWindow.vala:56
@ -61,6 +57,10 @@ msgstr ""
msgid "Create a new web app with Webpin" msgid "Create a new web app with Webpin"
msgstr "" msgstr ""
#: ../src/Widgets/WebApp.vala:94
msgid "Open request in an external application…"
msgstr ""
#: ../src/Widgets/Assistant.vala:74 #: ../src/Widgets/Assistant.vala:74
msgid "Create a new web app" msgid "Create a new web app"
msgstr "" msgstr ""
@ -124,7 +124,3 @@ msgstr ""
#: ../src/Widgets/ApplicationIcon.vala:147 #: ../src/Widgets/ApplicationIcon.vala:147
msgid "Edit Webapp Properties" msgid "Edit Webapp Properties"
msgstr "" msgstr ""
#: ../src/Widgets/WebApp.vala:93
msgid "Open request in an external application…"
msgstr ""

153
po/lt.po
View file

@ -7,88 +7,33 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-28 22:31+0300\n" "POT-Creation-Date: 2017-10-18 22:53+0300\n"
"PO-Revision-Date: 2017-08-28 22:39+0300\n" "PO-Revision-Date: 2017-10-18 22:55+0300\n"
"Last-Translator: Moo\n"
"Language-Team: \n" "Language-Team: \n"
"Language: lt\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n" "X-Generator: Poedit 1.8.7.1\n"
"Last-Translator: Moo\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%100<10 || n%100>=20) ? 1 : 2);\n"
"Language: lt\n"
#: ../src/Dialogs/InfoDialog.vala:44 #: ../src/Dialogs/InfoDialog.vala:44
msgid "Accept" msgid "Accept"
msgstr "Priimti" msgstr "Priimti"
#: ../src/Widgets/ApplicationIcon.vala:142 #: ../src/WebWindow.vala:53
msgid "Delete Webapp" msgid "Copy URI into clipboard"
msgstr "Ištrinti saityno programą" msgstr "Kopijuoti URI į iškarpinę"
#: ../src/Widgets/ApplicationIcon.vala:147 #: ../src/WebWindow.vala:65 ../src/Widgets/Assistant.vala:118
msgid "Edit Webapp Properties" msgid "Run in background when closed"
msgstr "Taisyti saityno programos savybes" msgstr "Užvėrus, palikti veikti fone"
#: ../src/Widgets/Assistant.vala:73 #: ../src/WebWindow.vala:115
msgid "Create a new web app" msgid "Open %s"
msgstr "Sukurti naują saityno programą" msgstr "Atverti %s"
#: ../src/Widgets/Assistant.vala:81
msgid "Application name"
msgstr "Programos pavadinimas"
#: ../src/Widgets/Assistant.vala:84
msgid "http://myapp.domain"
msgstr "http://manoprograma.sritis"
#: ../src/Widgets/Assistant.vala:94
msgid "theme icon name"
msgstr "temos piktogramos pavadinimas"
#: ../src/Widgets/Assistant.vala:96
msgid "or"
msgstr "arba"
#: ../src/Widgets/Assistant.vala:97
msgid "Set from file..."
msgstr "Nustatyti iš failo..."
#: ../src/Widgets/Assistant.vala:113
msgid "Save cookies"
msgstr "Įrašyti slapukus"
#: ../src/Widgets/Assistant.vala:115
msgid "Save login information"
msgstr "Įrašyti prisijungimo informaciją"
#: ../src/Widgets/Assistant.vala:138
msgid "Save app"
msgstr "Įrašyti programą"
#: ../src/Widgets/Assistant.vala:160
msgid "url must start with http:// or https://"
msgstr "url privalo prasidėti http:// arba https://"
#: ../src/Widgets/Assistant.vala:173
msgid "App already exist"
msgstr "Programa jau yra"
#: ../src/Widgets/Assistant.vala:226
msgid "Images"
msgstr "Paveikslai"
#: ../src/Widgets/Assistant.vala:238
msgid "Cancel"
msgstr "Atsisakyti"
#: ../src/Widgets/Assistant.vala:239
msgid "Open"
msgstr "Atverti"
#: ../src/Widgets/WebApp.vala:93
msgid "Open request in an external application…"
msgstr "Užklausa atveriama išorinėje programoje…"
#: ../src/MainWindow.vala:56 #: ../src/MainWindow.vala:56
msgid "Applications" msgid "Applications"
@ -113,3 +58,71 @@ msgstr "Sukurti programą"
#: ../src/MainWindow.vala:66 #: ../src/MainWindow.vala:66
msgid "Create a new web app with Webpin" msgid "Create a new web app with Webpin"
msgstr "Sukurkite naują saityno programą, naudodami Webpin" msgstr "Sukurkite naują saityno programą, naudodami Webpin"
#: ../src/Widgets/WebApp.vala:94
msgid "Open request in an external application…"
msgstr "Užklausa atveriama išorinėje programoje…"
#: ../src/Widgets/Assistant.vala:74
msgid "Create a new web app"
msgstr "Sukurti naują saityno programą"
#: ../src/Widgets/Assistant.vala:82
msgid "Application name"
msgstr "Programos pavadinimas"
#: ../src/Widgets/Assistant.vala:85
msgid "http://myapp.domain"
msgstr "http://manoprograma.sritis"
#: ../src/Widgets/Assistant.vala:95
msgid "theme icon name"
msgstr "temos piktogramos pavadinimas"
#: ../src/Widgets/Assistant.vala:97
msgid "or"
msgstr "arba"
#: ../src/Widgets/Assistant.vala:98
msgid "Set from file..."
msgstr "Nustatyti iš failo..."
#: ../src/Widgets/Assistant.vala:114
msgid "Save cookies"
msgstr "Įrašyti slapukus"
#: ../src/Widgets/Assistant.vala:116
msgid "Save login information"
msgstr "Įrašyti prisijungimo informaciją"
#: ../src/Widgets/Assistant.vala:141
msgid "Save app"
msgstr "Įrašyti programą"
#: ../src/Widgets/Assistant.vala:163
msgid "url must start with http:// or https://"
msgstr "url privalo prasidėti http:// arba https://"
#: ../src/Widgets/Assistant.vala:176
msgid "App already exist"
msgstr "Programa jau yra"
#: ../src/Widgets/Assistant.vala:229
msgid "Images"
msgstr "Paveikslai"
#: ../src/Widgets/Assistant.vala:241
msgid "Cancel"
msgstr "Atsisakyti"
#: ../src/Widgets/Assistant.vala:242
msgid "Open"
msgstr "Atverti"
#: ../src/Widgets/ApplicationIcon.vala:142
msgid "Delete Webapp"
msgstr "Ištrinti saityno programą"
#: ../src/Widgets/ApplicationIcon.vala:147
msgid "Edit Webapp Properties"
msgstr "Taisyti saityno programos savybes"

View file

@ -52,6 +52,13 @@ namespace Webpin {
headerbar.title = desktop_file.name; headerbar.title = desktop_file.name;
headerbar.show_close_button = true; headerbar.show_close_button = true;
var copy_url = new Gtk.Button.from_icon_name ("insert-link-symbolic", Gtk.IconSize.MENU);
copy_url.tooltip_text = _("Copy URI into clipboard");
copy_url.clicked.connect (() => {
Gtk.Clipboard.get_default (Gdk.Display.get_default ()).set_text (web_app.app_view.uri, -1);
});
headerbar.pack_end (copy_url);
spinner = new Gtk.Spinner (); spinner = new Gtk.Spinner ();
spinner.set_size_request (16, 16); spinner.set_size_request (16, 16);
headerbar.pack_end (spinner); headerbar.pack_end (spinner);

View file

@ -48,10 +48,9 @@ namespace Webpin {
icon_view.valign = Gtk.Align.START; icon_view.valign = Gtk.Align.START;
icon_view.vexpand = false; icon_view.vexpand = false;
icon_view.homogeneous = true; icon_view.homogeneous = true;
icon_view.column_spacing = 15; icon_view.column_spacing = 24;
icon_view.row_spacing = 15; icon_view.row_spacing = 24;
icon_view.margin = 15; icon_view.margin = 24;
icon_view.activate_on_single_click = false;
icon_view.child_activated.connect ((child) => { icon_view.child_activated.connect ((child) => {
if ((child as Gtk.FlowBoxChild).get_child () is ApplicationIcon) { if ((child as Gtk.FlowBoxChild).get_child () is ApplicationIcon) {
var app_icon = (child as Gtk.FlowBoxChild).get_child () as ApplicationIcon; var app_icon = (child as Gtk.FlowBoxChild).get_child () as ApplicationIcon;