Updated toolbar icons

This commit is contained in:
Tony George 2014-08-15 19:05:32 +05:30
parent d3dffcab8f
commit 8386adbbca
7 changed files with 89 additions and 146 deletions

View File

@ -2497,37 +2497,6 @@ public class Main : GLib.Object{
}
}
public Gdk.Pixbuf? get_app_icon(int icon_size){
return get_shared_icon("timeshift","timeshift.png",icon_size,"pixmaps");
}
public Gdk.Pixbuf? get_shared_icon(string icon_name, string fallback_icon_file_name, int icon_size, string icon_directory = "aptik/images"){
Gdk.Pixbuf pix_icon = null;
try {
Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
pix_icon = icon_theme.load_icon (icon_name, icon_size, 0);
} catch (Error e) {
//log_error (e.message);
}
string fallback_icon_file_path = App.share_folder + "/%s/%s".printf(icon_directory, fallback_icon_file_name);
if (pix_icon == null){
try {
pix_icon = new Gdk.Pixbuf.from_file_at_size (fallback_icon_file_path, icon_size, icon_size);
} catch (Error e) {
log_error (e.message);
}
}
if (pix_icon == null){
log_error (_("Missing Icon") + ": '%s', '%s'".printf(icon_name, fallback_icon_file_path));
}
return pix_icon;
}
}
public class TimeShiftBackup : GLib.Object{

View File

@ -98,7 +98,7 @@ class MainWindow : Gtk.Window{
this.modal = true;
this.set_default_size (700, 500);
this.delete_event.connect(on_delete_event);
this.icon = App.get_app_icon(16);
this.icon = get_app_icon(16);
//vboxMain
vbox_main = new Box (Orientation.VERTICAL, 0);
@ -196,44 +196,20 @@ class MainWindow : Gtk.Window{
btn_donate = new Gtk.ToolButton.from_stock ("gtk-missing-image");
btn_donate.label = _("Donate");
btn_donate.set_tooltip_text (_("Donate"));
btn_donate.icon_widget = get_shared_icon("donate","donate.svg",24);
toolbar.add(btn_donate);
btn_donate.clicked.connect(btn_donate_clicked);
try{
var pix = new Gdk.Pixbuf.from_file_at_size(App.share_folder + "/timeshift/images/donate.svg",icon_size_toolbar,icon_size_toolbar);
var img = new Gtk.Image.from_pixbuf(pix);
btn_donate.set_icon_widget(img);
}
catch(Error e){
log_error (e.message);
}
//btn_about
btn_about = new Gtk.ToolButton.from_stock ("gtk-about");
btn_about.label = _("About");
btn_about.set_tooltip_text (_("Application Info"));
btn_about.icon_widget = get_shared_icon("","help-info.svg",24);
toolbar.add(btn_about);
btn_about.clicked.connect (btn_about_clicked);
try{
var pix = new Gdk.Pixbuf.from_file_at_size(App.share_folder + "/timeshift/images/help-info.svg",icon_size_toolbar,icon_size_toolbar);
var img = new Gtk.Image.from_pixbuf(pix);
btn_about.set_icon_widget(img);
}
catch(Error e){
log_error (e.message);
}
//btn_about
btn_about = new Gtk.ToolButton.from_stock ("gtk-about");
btn_about.label = _("About");
btn_about.set_tooltip_text (_("About TimeShift"));
toolbar.add(btn_about);
btn_about.clicked.connect (btn_about_clicked);
//backup device ------------------------------------------------
//hbox_device

View File

@ -100,7 +100,7 @@ public class RestoreWindow : Gtk.Dialog{
this.set_modal (true);
this.set_default_size (550, 500);
this.skip_taskbar_hint = true;
this.icon = App.get_app_icon(16);
this.icon = get_app_icon(16);
//vbox_main
vbox_main = get_content_area ();

View File

@ -95,7 +95,7 @@ public class SettingsWindow : Gtk.Dialog{
this.set_destroy_with_parent (true);
this.set_modal (true);
this.set_default_size (450, 500);
this.icon = App.get_app_icon(16);
this.icon = get_app_icon(16);
//vboxMain
vbox_main = get_content_area ();

View File

@ -1747,8 +1747,8 @@ namespace TeeJee.GtkHelper{
}
}
public Gdk.Pixbuf? get_app_icon(int icon_size){
var img_icon = get_shared_icon(AppShortName, AppShortName + ".png",icon_size,"pixmaps");
public Gdk.Pixbuf? get_app_icon(int icon_size, string format = ".png"){
var img_icon = get_shared_icon(AppShortName, AppShortName + format,icon_size,"pixmaps");
if (img_icon != null){
return img_icon.pixbuf;
}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: timeshift 1.2\n"
"Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
"POT-Creation-Date: 2014-08-15 18:09+0530\n"
"POT-Creation-Date: 2014-08-15 18:51+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: MainWindow.vala:1173
#: MainWindow.vala:1149
msgid "A System Restore Utility for Linux"
msgstr ""
@ -25,14 +25,10 @@ msgstr ""
msgid "A scheduled job is currently taking a system snapshot."
msgstr ""
#: MainWindow.vala:214 MainWindow.vala:231
#: MainWindow.vala:206
msgid "About"
msgstr ""
#: MainWindow.vala:232
msgid "About TimeShift"
msgstr ""
#: Main.vala:159
msgid "Admin Access Required"
msgstr ""
@ -73,7 +69,7 @@ msgstr ""
msgid "Application"
msgstr ""
#: MainWindow.vala:215
#: MainWindow.vala:207
msgid "Application Info"
msgstr ""
@ -107,11 +103,11 @@ msgstr ""
msgid "Backup"
msgstr ""
#: MainWindow.vala:247
#: MainWindow.vala:223
msgid "Backup Device"
msgstr ""
#: MainWindow.vala:597 MainWindow.vala:617
#: MainWindow.vala:573 MainWindow.vala:593
msgid "Backup Device Changed"
msgstr ""
@ -119,15 +115,15 @@ msgstr ""
msgid "Backup Level"
msgstr ""
#: MainWindow.vala:836
#: MainWindow.vala:812
msgid "Backup device does not have enough space"
msgstr ""
#: Main.vala:2306 MainWindow.vala:1302 MainWindow.vala:1310
#: Main.vala:2306 MainWindow.vala:1278 MainWindow.vala:1286
msgid "Backup device does not have enough space!"
msgstr ""
#: MainWindow.vala:1294
#: MainWindow.vala:1270
msgid "Backup device is not mounted!"
msgstr ""
@ -135,7 +131,7 @@ msgstr ""
msgid "Backup device not available"
msgstr ""
#: MainWindow.vala:1040
#: MainWindow.vala:1016
msgid "Before restoring"
msgstr ""
@ -173,7 +169,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
#: MainWindow.vala:489
#: MainWindow.vala:465
msgid "Checking backup device..."
msgstr ""
@ -185,7 +181,7 @@ msgstr ""
msgid "Clear the list"
msgstr ""
#: MainWindow.vala:594
#: MainWindow.vala:570
msgid "Click 'OK' to confirm"
msgstr ""
@ -197,7 +193,7 @@ msgstr ""
msgid "Commands listed below are not available on this system"
msgstr ""
#: MainWindow.vala:389
#: MainWindow.vala:365
msgid "Comments"
msgstr ""
@ -257,7 +253,7 @@ msgstr ""
msgid "Deleted incomplete snapshot"
msgstr ""
#: MainWindow.vala:928 MainWindow.vala:943
#: MainWindow.vala:904 MainWindow.vala:919
msgid "Deleting snapshot"
msgstr ""
@ -297,11 +293,11 @@ msgid ""
"teejeetech@gmail.com"
msgstr ""
#: MainWindow.vala:528 MainWindow.vala:550
#: MainWindow.vala:504 MainWindow.vala:526
msgid "Disable Scheduled Snapshots"
msgstr ""
#: MainWindow.vala:1347
#: MainWindow.vala:1323
msgid "Disabled"
msgstr ""
@ -309,21 +305,21 @@ msgstr ""
msgid "Distribution"
msgstr ""
#: MainWindow.vala:547
#: MainWindow.vala:523
msgid "Do you want to select another device now?"
msgstr ""
#: MainWindow.vala:614
#: MainWindow.vala:590
msgid "Do you want to select another device?"
msgstr ""
#: MainWindow.vala:1018
#: MainWindow.vala:994
msgid ""
"Do you want to take a snapshot of the current system before restoring the "
"selected snapshot?"
msgstr ""
#: MainWindow.vala:569
#: MainWindow.vala:545
msgid "Do you want to take the first snapshot now?"
msgstr ""
@ -355,24 +351,24 @@ msgstr ""
msgid "Enable"
msgstr ""
#: MainWindow.vala:1343
#: MainWindow.vala:1319
msgid "Enabled"
msgstr ""
#: Main.vala:229 Main.vala:1696 MainWindow.vala:811 MainWindow.vala:1069
#: Main.vala:229 Main.vala:1696 MainWindow.vala:787 MainWindow.vala:1045
#: RestoreWindow.vala:1204 RestoreWindow.vala:1222 Utility.vala:101
msgid "Error"
msgstr ""
#: MainWindow.vala:933
#: MainWindow.vala:909
msgid "Error: Unable to delete snapshot"
msgstr ""
#: MainWindow.vala:858
#: MainWindow.vala:834
msgid "Error: Unable to save snapshot"
msgstr ""
#: MainWindow.vala:492
#: MainWindow.vala:468
msgid "Estimating system size..."
msgstr ""
@ -445,7 +441,7 @@ msgstr ""
msgid "Failed to mount BTRFS subvolume"
msgstr ""
#: MainWindow.vala:809 RestoreWindow.vala:1205 RestoreWindow.vala:1223
#: MainWindow.vala:785 RestoreWindow.vala:1205 RestoreWindow.vala:1223
msgid "Failed to mount device"
msgstr ""
@ -486,11 +482,11 @@ msgstr ""
msgid "Files will be overwritten on the target device!"
msgstr ""
#: MainWindow.vala:572
#: MainWindow.vala:548
msgid "First Snapshot"
msgstr ""
#: Main.vala:2312 MainWindow.vala:1311
#: Main.vala:2312 MainWindow.vala:1287
msgid "First snapshot needs"
msgstr ""
@ -641,7 +637,7 @@ msgstr ""
msgid "Last monthly snapshot not found"
msgstr ""
#: MainWindow.vala:1369 MainWindow.vala:1373 MainWindow.vala:1377
#: MainWindow.vala:1345 MainWindow.vala:1349 MainWindow.vala:1353
msgid "Last snapshot is"
msgstr ""
@ -670,11 +666,11 @@ msgstr ""
msgid "Log"
msgstr ""
#: MainWindow.vala:836
#: MainWindow.vala:812
msgid "Low Disk Space"
msgstr ""
#: MainWindow.vala:509
#: MainWindow.vala:485
msgid "Main window closed by user"
msgstr ""
@ -686,7 +682,7 @@ msgstr ""
msgid "Missing Dependencies"
msgstr ""
#: Main.vala:2525 Utility.vala:1782
#: Utility.vala:1782
msgid "Missing Icon"
msgstr ""
@ -706,11 +702,11 @@ msgstr ""
msgid "Mount"
msgstr ""
#: MainWindow.vala:973
#: MainWindow.vala:949
msgid "Multiple Snapshots Selected"
msgstr ""
#: MainWindow.vala:881 MainWindow.vala:969
#: MainWindow.vala:857 MainWindow.vala:945
msgid "No Snapshots Selected"
msgstr ""
@ -718,7 +714,7 @@ msgstr ""
msgid "No changes were made to system."
msgstr ""
#: MainWindow.vala:1360
#: MainWindow.vala:1336
msgid "No snapshots on device"
msgstr ""
@ -781,19 +777,19 @@ msgstr ""
msgid "Please save your work and close all applications."
msgstr ""
#: MainWindow.vala:786
#: MainWindow.vala:762
msgid "Please select a device for saving snapshots."
msgstr ""
#: MainWindow.vala:973
#: MainWindow.vala:949
msgid "Please select a single snapshot"
msgstr ""
#: MainWindow.vala:1124
#: MainWindow.vala:1100
msgid "Please select a snapshot to view the log!"
msgstr ""
#: Main.vala:2295 MainWindow.vala:1291
#: Main.vala:2295 MainWindow.vala:1267
msgid "Please select the backup device"
msgstr ""
@ -805,11 +801,11 @@ msgstr ""
msgid "Please select the root device (/)"
msgstr ""
#: MainWindow.vala:969
#: MainWindow.vala:945
msgid "Please select the snapshot to restore"
msgstr ""
#: MainWindow.vala:881
#: MainWindow.vala:857
msgid "Please select the snapshots to delete"
msgstr ""
@ -833,11 +829,11 @@ msgstr ""
msgid "Rebooting system..."
msgstr ""
#: MainWindow.vala:170 MainWindow.vala:272
#: MainWindow.vala:170 MainWindow.vala:248
msgid "Refresh"
msgstr ""
#: MainWindow.vala:274
#: MainWindow.vala:250
msgid "Refresh Devices"
msgstr ""
@ -861,7 +857,7 @@ msgstr ""
msgid "Removing older backups to free disk space"
msgstr ""
#: MainWindow.vala:889
#: MainWindow.vala:865
msgid "Removing selected snapshots..."
msgstr ""
@ -882,11 +878,11 @@ msgstr ""
msgid "Restore"
msgstr ""
#: MainWindow.vala:1058
#: MainWindow.vala:1034
msgid "Restore Complete"
msgstr ""
#: MainWindow.vala:1066
#: MainWindow.vala:1042
msgid "Restore Failed!"
msgstr ""
@ -902,11 +898,11 @@ msgstr ""
msgid "Restore failed with exit code"
msgstr ""
#: MainWindow.vala:1065
#: MainWindow.vala:1041
msgid "Restore was not successful!"
msgstr ""
#: MainWindow.vala:1048
#: MainWindow.vala:1024
msgid "Restoring snapshot"
msgstr ""
@ -914,7 +910,7 @@ msgstr ""
msgid "Rule"
msgstr ""
#: MainWindow.vala:1337
#: MainWindow.vala:1313
msgid "Running from Live CD/USB"
msgstr ""
@ -930,11 +926,11 @@ msgstr ""
msgid "Scheduled Snapshots"
msgstr ""
#: MainWindow.vala:567
#: MainWindow.vala:543
msgid "Scheduled jobs will be enabled only after the first snapshot is taken."
msgstr ""
#: MainWindow.vala:1343 MainWindow.vala:1347
#: MainWindow.vala:1319 MainWindow.vala:1323
msgid "Scheduled snapshots"
msgstr ""
@ -942,15 +938,15 @@ msgstr ""
msgid "Scheduled snapshots are disabled"
msgstr ""
#: Main.vala:728 MainWindow.vala:546
#: Main.vala:728 MainWindow.vala:522
msgid "Scheduled snapshots will be disabled till another device is selected."
msgstr ""
#: MainWindow.vala:525 MainWindow.vala:613
#: MainWindow.vala:501 MainWindow.vala:589
msgid "Scheduled snapshots will be disabled."
msgstr ""
#: MainWindow.vala:593
#: MainWindow.vala:569
msgid "Scheduled snapshots will be saved to "
msgstr ""
@ -958,7 +954,7 @@ msgstr ""
msgid "Select Root Device"
msgstr ""
#: MainWindow.vala:1124
#: MainWindow.vala:1100
msgid "Select Snapshot"
msgstr ""
@ -978,7 +974,7 @@ msgstr ""
msgid "Select the applications for which current settings should be kept."
msgstr ""
#: MainWindow.vala:545
#: MainWindow.vala:521
msgid "Selected device does not have enough space."
msgstr ""
@ -1012,7 +1008,7 @@ msgid "Size"
msgstr ""
#: Main.vala:1025 Main.vala:1175 Main.vala:1202 Main.vala:1240 Main.vala:1259
#: MainWindow.vala:313
#: MainWindow.vala:289
msgid "Snapshot"
msgstr ""
@ -1020,11 +1016,11 @@ msgstr ""
msgid "Snapshot deleted"
msgstr ""
#: MainWindow.vala:1054
#: MainWindow.vala:1030
msgid "Snapshot restored successfully"
msgstr ""
#: Main.vala:1171 MainWindow.vala:855
#: Main.vala:1171 MainWindow.vala:831
msgid "Snapshot saved successfully"
msgstr ""
@ -1036,11 +1032,11 @@ msgstr ""
msgid "Snapshots"
msgstr ""
#: MainWindow.vala:948
#: MainWindow.vala:924
msgid "Snapshots deleted successfully"
msgstr ""
#: MainWindow.vala:254
#: MainWindow.vala:230
msgid "Snapshots will be saved in path <b>/timeshift</b> on selected device"
msgstr ""
@ -1060,12 +1056,12 @@ msgstr ""
msgid "Synching files..."
msgstr ""
#: MainWindow.vala:342 RestoreWindow.vala:249 RestoreWindow.vala:733
#: MainWindow.vala:318 RestoreWindow.vala:249 RestoreWindow.vala:733
#, c-format
msgid "System"
msgstr ""
#: MainWindow.vala:1344
#: MainWindow.vala:1320
msgid "System snapshots will be taken at regular intervals"
msgstr ""
@ -1077,11 +1073,11 @@ msgstr ""
msgid "System will reboot to complete the restore process."
msgstr ""
#: MainWindow.vala:366
#: MainWindow.vala:342
msgid "Tags"
msgstr ""
#: MainWindow.vala:1021
#: MainWindow.vala:997
msgid "Take Snapshot"
msgstr ""
@ -1097,7 +1093,7 @@ msgstr ""
msgid "Take scheduled backup"
msgstr ""
#: MainWindow.vala:844 MainWindow.vala:1029
#: MainWindow.vala:820 MainWindow.vala:1005
msgid "Taking snapshot..."
msgstr ""
@ -1109,7 +1105,7 @@ msgstr ""
msgid "Terminating rsync process"
msgstr ""
#: MainWindow.vala:612
#: MainWindow.vala:588
msgid "The backup device is not set or unavailable."
msgstr ""
@ -1131,7 +1127,7 @@ msgstr ""
msgid "TimeShift Logs"
msgstr ""
#: MainWindow.vala:1338
#: MainWindow.vala:1314
msgid "TimeShift is running in a live system"
msgstr ""
@ -1205,7 +1201,7 @@ msgstr ""
msgid "WARNING"
msgstr ""
#: MainWindow.vala:785
#: MainWindow.vala:761
msgid "WARNING:"
msgstr ""
@ -1238,7 +1234,7 @@ msgstr ""
msgid "When free space less than"
msgstr ""
#: MainWindow.vala:1369
#: MainWindow.vala:1345
msgid "days old"
msgstr ""
@ -1250,11 +1246,11 @@ msgstr ""
msgid "free"
msgstr ""
#: MainWindow.vala:1373
#: MainWindow.vala:1349
msgid "hours old"
msgstr ""
#: MainWindow.vala:1377
#: MainWindow.vala:1353
msgid "mins old"
msgstr ""
@ -1262,7 +1258,7 @@ msgstr ""
msgid "rsync returned an error"
msgstr ""
#: MainWindow.vala:591
#: MainWindow.vala:567
msgid "snapshot device changed"
msgstr ""

View File

@ -17,16 +17,18 @@ long_line_behaviour=1
long_line_column=80
[files]
current_page=1
current_page=2
FILE_NAME_0=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FExcludeMessageWindow.vala;0;4
FILE_NAME_1=18608;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4
FILE_NAME_2=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_3=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4
FILE_NAME_4=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_5=7963;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility.vala;0;4
FILE_NAME_1=65756;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4
FILE_NAME_2=6441;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_3=3012;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4
FILE_NAME_4=9217;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_5=42217;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility.vala;0;4
FILE_NAME_6=598;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Finstaller%2Finstall.sh;0;4
FILE_NAME_7=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FAboutWindow.vala;0;4
FILE_NAME_8=2882;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FDonationWindow.vala;0;4
FILE_NAME_8=2333;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FDonationWindow.vala;0;4
FILE_NAME_9=412;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4
FILE_NAME_10=7560;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
[VTE]
last_dir=/home/teejee