Switchboard Desktop Plug

Merge lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1079580 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

  1. fix-1079580
  2. Merge into trunk
Proposed by Jaap Broekhuizen
Status: Merged
Approved by: Rico Tzschichholz
Approved revision: 52
Merged at revision: 51
Proposed branch: lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1079580
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 229 lines (+74/-65)
2 files modified
po/desktop-plug.pot (+72/-64)
src/desktop-plug.vala (+2/-1)
To merge this branch: bzr merge lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1079580
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+135432@code.launchpad.net
To post a comment you must log in.
lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1079580 updated
52. By Jaap Broekhuizen

Fix counting of items in monitor list for plank, bug #1081639.

Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/desktop-plug.pot'
--- po/desktop-plug.pot 2012-10-26 15:43:50 +0000
+++ po/desktop-plug.pot 2012-11-21 15:13:24 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-10-26 17:39+0200\n"11"POT-Creation-Date: 2012-11-21 15:57+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,129 +17,137 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:11620#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:59
21msgid "Pictures folder"21#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:124
22msgstr ""
23
24#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:117
25msgid "Backgrounds folder"
26msgstr ""
27
28#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:118
29msgid "Custom folder"
30msgstr ""
31
32#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:123
33msgid "None"
34msgstr ""
35
36#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:124
37#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:59
38msgid "Wallpaper"22msgid "Wallpaper"
39msgstr ""23msgstr ""
4024
41#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:12525#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:83
42msgid "Centered"
43msgstr ""
44
45#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:126
46msgid "Scaled"
47msgstr ""
48
49#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:127
50msgid "Stretched"
51msgstr ""
52
53#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:128
54msgid "Zoom"
55msgstr ""
56
57#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:220
58msgid "Select a folder"
59msgstr ""
60
61#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:241
62#, c-format
63msgid "Importing wallpapers from %s"
64msgstr ""
65
66#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:83
67msgid "Don't hide"26msgid "Don't hide"
68msgstr ""27msgstr ""
6928
70#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:8429#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:84
71msgid "Intelligent hide"30msgid "Intelligent hide"
72msgstr ""31msgstr ""
7332
74#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:8533#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:85
75msgid "Auto hide"34msgid "Auto hide"
76msgstr ""35msgstr ""
7736
78#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:8637#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:86
79msgid "Hide on maximize"38msgid "Hide on maximize"
80msgstr ""39msgstr ""
8140
82#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:9541#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:93
42msgid "Primary Monitor"
43msgstr ""
44
45#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:96
83#, c-format46#, c-format
84msgid "Monitor %d"47msgid "Monitor %d"
85msgstr ""48msgstr ""
8649
87#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:10250#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:103
88msgid "Icon Size:"51msgid "Icon Size:"
89msgstr ""52msgstr ""
9053
91#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:10554#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:106
92msgid "Hide Mode:"55msgid "Hide Mode:"
93msgstr ""56msgstr ""
9457
95#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:10858#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:109
96msgid "Monitor:"59msgid "Monitor:"
97msgstr ""60msgstr ""
9861
99#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:11662#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:113
100msgid "Dock"63msgid "Dock"
101msgstr ""64msgstr ""
10265
103#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:12466#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:121
104msgid "When the cursor enters the corner of the display:"67msgid "When the cursor enters the corner of the display:"
105msgstr ""68msgstr ""
10669
107#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:15370#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:150
108msgid "Custom Command:"71msgid "Custom Command:"
109msgstr ""72msgstr ""
11073
111#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:16574#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:162
112msgid "Hot Corners"75msgid "Hot Corners"
113msgstr ""76msgstr ""
11477
115#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18278#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:179
116msgid "Do Nothing"79msgid "Do Nothing"
117msgstr ""80msgstr ""
11881
119#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18382#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:180
120msgid "Show Workspace View"83msgid "Show Workspace View"
121msgstr ""84msgstr ""
12285
123#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18486#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:181
124msgid "Maximize Current Window"87msgid "Maximize Current Window"
125msgstr ""88msgstr ""
12689
127#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18590#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:182
128msgid "Minimize Current Window"91msgid "Minimize Current Window"
129msgstr ""92msgstr ""
13093
131#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18694#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:183
132msgid "Open Launcher"95msgid "Open Launcher"
133msgstr ""96msgstr ""
13497
135#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:18798#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:184
99msgid "Expose Windows"
100msgstr ""
101
102#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:185
136msgid "Expose All Windows"103msgid "Expose All Windows"
137msgstr ""104msgstr ""
138105
139#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:188106#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:186
140msgid "Execute Custom Command"107msgid "Execute Custom Command"
141msgstr ""108msgstr ""
142109
143#: /home/noelco/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:207110#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:205
144msgid "Desktop"111msgid "Desktop"
145msgstr ""112msgstr ""
113
114#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:116
115msgid "Pictures folder"
116msgstr ""
117
118#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:117
119msgid "Backgrounds folder"
120msgstr ""
121
122#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:118
123msgid "Custom folder"
124msgstr ""
125
126#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:123
127msgid "None"
128msgstr ""
129
130#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:125
131msgid "Centered"
132msgstr ""
133
134#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:126
135msgid "Scaled"
136msgstr ""
137
138#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:127
139msgid "Stretched"
140msgstr ""
141
142#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:128
143msgid "Zoom"
144msgstr ""
145
146#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:220
147msgid "Select a folder"
148msgstr ""
149
150#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:241
151#, c-format
152msgid "Importing wallpapers from %s"
153msgstr ""
146154
=== modified file 'src/desktop-plug.vala'
--- src/desktop-plug.vala 2012-11-21 11:30:30 +0000
+++ src/desktop-plug.vala 2012-11-21 15:13:24 +0000
@@ -90,9 +90,10 @@
90 hide_mode.width_request = 164;90 hide_mode.width_request = 164;
91 91
92 var monitor = new Gtk.ComboBoxText ();92 var monitor = new Gtk.ComboBoxText ();
93 monitor.append ("-1", _("Primary Monitor"));
93 int i = 0;94 int i = 0;
94 for (i = 0; i < Gdk.Screen.get_default ().get_n_monitors () ; i ++) {95 for (i = 0; i < Gdk.Screen.get_default ().get_n_monitors () ; i ++) {
95 monitor.append ( (i+1).to_string (), _("Monitor %d").printf (i+1) );96 monitor.append ( (i).to_string (), _("Monitor %d").printf (i+1) );
96 }97 }
97 monitor.active_id = ( PlankSettings.get_default ().monitor +1 ).to_string ();98 monitor.active_id = ( PlankSettings.get_default ().monitor +1 ).to_string ();
98 monitor.changed.connect (() => PlankSettings.get_default ().monitor = int.parse (monitor.active_id));99 monitor.changed.connect (() => PlankSettings.get_default ().monitor = int.parse (monitor.active_id));

Subscribers

People subscribed via source and target branches

to all changes: