diff -Nru aptik-bmon-1.0.1/aptik-bmon.pot aptik-bmon-1.0.2/aptik-bmon.pot --- aptik-bmon-1.0.1/aptik-bmon.pot 2015-09-22 02:46:23.000000000 +0000 +++ aptik-bmon-1.0.2/aptik-bmon.pot 2015-10-21 13:16:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: aptik-bmon 1.6\n" "Report-Msgid-Bugs-To: teejee2008@gmail.com\n" -"POT-Creation-Date: 2015-09-20 23:16-0400\n" +"POT-Creation-Date: 2015-10-21 18:36+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,8 +57,8 @@ msgid "Application Info" msgstr "" -#: AptikBatteryStatsGtk.vala:48 -msgid "Aptik Battery Monitor needs admin access to function properly." +#: AptikBatteryStats.vala:49 AptikBatteryStatsGtk.vala:48 +msgid "Aptik Battery Monitor needs admin access to function correctly." msgstr "" #: AboutWindow.vala:330 @@ -87,18 +87,14 @@ msgid "Credits" msgstr "" -#: DonationWindow.vala:55 +#: DonationWindow.vala:54 msgid "" "Did you find this software useful?\n" "\n" -"You can buy me a cup of coffee to show your support. Or just drop me an " -"email and say Hi. This application is completely free and will continue to " -"remain that way. Your contributions will help in keeping this project alive " -"and improving it further.\n" -"\n" -"If you want to buy me a coffee, you can send me $2 using the Google Wallet " -"app on your phone. You can even send it through email. GMail has a new " -"feature to attach money to emails from your Google Wallet.\n" +"You can buy me a coffee or make a donation via PayPal to show your support. " +"Or just drop me an email and say Hi. This application is completely free and " +"will continue to remain that way. Your contributions will help in keeping " +"this project alive and improving it further.\n" "\n" "Feel free to send me an email if you find any issues in this application or " "if you need any changes. Suggestions and feedback are always welcome.\n" @@ -118,6 +114,14 @@ msgid "Donate" msgstr "" +#: DonationWindow.vala:74 +msgid "Donate with Google Wallet" +msgstr "" + +#: DonationWindow.vala:67 +msgid "Donate with PayPal" +msgstr "" + #: AboutWindow.vala:354 #, c-format msgid "Donations" @@ -147,11 +151,11 @@ msgid "Missing Icon" msgstr "" -#: DonationWindow.vala:89 +#: DonationWindow.vala:95 msgid "OK" msgstr "" -#: AptikBatteryStats.vala:78 AptikBatteryStatsGtk.vala:108 +#: AptikBatteryStats.vala:79 AptikBatteryStatsGtk.vala:108 msgid "Options" msgstr "" @@ -163,23 +167,23 @@ msgid "Please run the application as admin ('gksu aptik-bmon-gtk')" msgstr "" +#: AptikBatteryStats.vala:50 +msgid "Please run the application as admin ('sudo aptik-bmon')" +msgstr "" + #: AptikBatteryStatsGtk.vala:110 msgid "Print debug information" msgstr "" -#: AptikBatteryStats.vala:80 +#: AptikBatteryStats.vala:81 msgid "Print stats to standard output" msgstr "" -#: DonationWindow.vala:75 -msgid "Send Email (teejeetech@gmail.com)" -msgstr "" - -#: DonationWindow.vala:68 -msgid "Sending Money with Google Wallet" +#: DonationWindow.vala:81 +msgid "Send Email" msgstr "" -#: AptikBatteryStats.vala:81 AptikBatteryStatsGtk.vala:111 +#: AptikBatteryStats.vala:82 AptikBatteryStatsGtk.vala:111 msgid "Show all options" msgstr "" @@ -187,7 +191,7 @@ msgid "Stopped" msgstr "" -#: AptikBatteryStats.vala:76 AptikBatteryStatsGtk.vala:106 +#: AptikBatteryStats.vala:77 AptikBatteryStatsGtk.vala:106 msgid "Syntax" msgstr "" @@ -205,7 +209,7 @@ msgid "Unknown option" msgstr "" -#: DonationWindow.vala:82 +#: DonationWindow.vala:88 msgid "Visit Website" msgstr "" diff -Nru aptik-bmon-1.0.1/debian/bzr-builder.manifest aptik-bmon-1.0.2/debian/bzr-builder.manifest --- aptik-bmon-1.0.1/debian/bzr-builder.manifest 2015-09-22 02:46:24.000000000 +0000 +++ aptik-bmon-1.0.2/debian/bzr-builder.manifest 2015-10-21 13:16:45.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~5 -lp:~teejee2008/aptik-bmon/trunk revid:tony.george.kol@gmail.com-20150921032450-ft20cnthxxvgh7m4 +# bzr-builder format 0.3 deb-version {debupstream}-0~7 +lp:~teejee2008/aptik-bmon/trunk revid:tony.george.kol@gmail.com-20151021130707-dg3qhyf9llxs4k25 diff -Nru aptik-bmon-1.0.1/debian/changelog aptik-bmon-1.0.2/debian/changelog --- aptik-bmon-1.0.1/debian/changelog 2015-09-22 02:46:24.000000000 +0000 +++ aptik-bmon-1.0.2/debian/changelog 2015-10-21 13:16:45.000000000 +0000 @@ -1,13 +1,11 @@ -aptik-bmon (1.0.1-0~5~ubuntu14.04.1) trusty; urgency=low +aptik-bmon (1.0.2-0~7~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Tony George Tue, 22 Sep 2015 02:46:24 +0000 + -- Tony George Wed, 21 Oct 2015 13:16:45 +0000 -aptik-bmon (1.0.1) trusty; urgency=low +aptik-bmon (1.0.2) trusty; urgency=low - * Updated donation message and un-installer + * Minor changes - * Added check for admin access to the Gtk application - - -- Tony George Sun, 20 Sep 2015 10:00:00 +0530 + -- Tony George Wed, 21 Oct 2015 10:00:00 +0530 diff -Nru aptik-bmon-1.0.1/src/DonationWindow.vala aptik-bmon-1.0.2/src/DonationWindow.vala --- aptik-bmon-1.0.1/src/DonationWindow.vala 2015-09-22 02:46:23.000000000 +0000 +++ aptik-bmon-1.0.2/src/DonationWindow.vala 2015-10-21 13:16:45.000000000 +0000 @@ -33,18 +33,17 @@ public class DonationWindow : Dialog { public DonationWindow() { - title = _("Donate"); + set_title(_("Donate")); window_position = WindowPosition.CENTER_ON_PARENT; - destroy_with_parent = true; - skip_taskbar_hint = true; - modal = true; - deletable = true; - - set_default_size (400, 20); + set_destroy_with_parent (true); + set_modal (true); + set_deletable(true); + set_skip_taskbar_hint(false); + set_default_size (400, 20); icon = get_app_icon(16); //vbox_main - Box vbox_main = get_content_area(); + Box vbox_main = get_content_area(); vbox_main.margin = 6; vbox_main.homogeneous = false; @@ -52,27 +51,34 @@ //lbl_message Label lbl_message = new Gtk.Label(""); - string msg = _("Did you find this software useful?\n\nYou can buy me a cup of coffee to show your support. Or just drop me an email and say Hi. This application is completely free and will continue to remain that way. Your contributions will help in keeping this project alive and improving it further.\n\nIf you want to buy me a coffee, you can send me $2 using the Google Wallet app on your phone. You can even send it through email. GMail has a new feature to attach money to emails from your Google Wallet.\n\nFeel free to send me an email if you find any issues in this application or if you need any changes. Suggestions and feedback are always welcome.\n\nThanks,\nTony George\n(teejeetech@gmail.com)"); + string msg = _("Did you find this software useful?\n\nYou can buy me a coffee or make a donation via PayPal to show your support. Or just drop me an email and say Hi. This application is completely free and will continue to remain that way. Your contributions will help in keeping this project alive and improving it further.\n\nFeel free to send me an email if you find any issues in this application or if you need any changes. Suggestions and feedback are always welcome.\n\nThanks,\nTony George\n(teejeetech@gmail.com)"); lbl_message.label = msg; lbl_message.wrap = true; vbox_main.pack_start(lbl_message,true,true,0); //vbox_actions - Box vbox_actions = new Box (Orientation.VERTICAL, 6); + Box vbox_actions = new Box (Orientation.VERTICAL, 6); vbox_actions.margin_left = 50; vbox_actions.margin_right = 50; vbox_actions.margin_top = 20; vbox_main.pack_start(vbox_actions,false,false,0); - //btn_donate - Button btn_donate = new Button.with_label(" " + _("Sending Money with Google Wallet") + " "); - vbox_actions.add(btn_donate); - btn_donate.clicked.connect(()=>{ - xdg_open("https://support.google.com/mail/answer/3141103?hl=en"); + //btn_donate_paypal + Button btn_donate_paypal = new Button.with_label(" " + _("Donate with PayPal") + " "); + vbox_actions.add(btn_donate_paypal); + btn_donate_paypal.clicked.connect(()=>{ + xdg_open("https://www.paypal.com/cgi-bin/webscr?business=teejeetech@gmail.com&cmd=_xclick¤cy_code=USD&amount=10&item_name=AptikBatteryMonitor%20Donation"); }); + //btn_donate_wallet + Button btn_donate_wallet = new Button.with_label(" " + _("Donate with Google Wallet") + " "); + vbox_actions.add(btn_donate_wallet); + btn_donate_wallet.clicked.connect(()=>{ + xdg_open("https://support.google.com/mail/answer/3141103?hl=en"); + }); + //btn_send_email - Button btn_send_email = new Button.with_label(" " + _("Send Email (teejeetech@gmail.com)") + " "); + Button btn_send_email = new Button.with_label(" " + _("Send Email") + " "); vbox_actions.add(btn_send_email); btn_send_email.clicked.connect(()=>{ xdg_open("mailto:teejeetech@gmail.com"); diff -Nru aptik-bmon-1.0.1/src/Main.vala aptik-bmon-1.0.2/src/Main.vala --- aptik-bmon-1.0.1/src/Main.vala 2015-09-22 02:46:23.000000000 +0000 +++ aptik-bmon-1.0.2/src/Main.vala 2015-10-21 13:16:45.000000000 +0000 @@ -38,7 +38,7 @@ public Main App; public const string AppName = "Aptik Battery Monitor"; public const string AppShortName = "aptik-bmon"; -public const string AppVersion = "1.0.1"; +public const string AppVersion = "1.0.2"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com";