GWoffice

Merge lp:~eugenesan/gwoffice/gwoffice into lp:gwoffice

  1. gwoffice
  2. Merge into gwoffice
Proposed by Eugene San
Status: Needs review
Proposed branch: lp:~eugenesan/gwoffice/gwoffice
Merge into: lp:gwoffice
Diff against target: 113 lines (+29/-3)
7 files modified
CMakeLists.txt (+1/-1)
data/gwoffice.desktop (+1/-1)
data/org.gnome.gwoffice.gschema.xml (+5/-0)
po/gwoffice.pot (+12/-0)
src/GWoffice.vala (+1/-1)
src/Services/Settings.vala (+1/-0)
src/Widgets/Preferences.vala (+8/-0)
To merge this branch: bzr merge lp:~eugenesan/gwoffice/gwoffice
Reviewer Review Type Date Requested Status
Tom Beckmann Pending
Review via email: mp+119259@code.launchpad.net

Description of the change

install to standard location
configurable sync folder

To post a comment you must log in.
lp:~eugenesan/gwoffice/gwoffice updated
75. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

76. By Tom Beckmann

Make login dialog non resizable, make compiling work with newest granite API changes

77. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

78. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

79. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

80. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

81. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

82. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

83. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

84. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

85. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

86. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

87. By Launchpad Translations on behalf of tombeckmann

Launchpad automatic translations update.

Unmerged revisions

89. By Eugene San

configurable sync folder

88. By Eugene San

install to standard location

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-07-17 12:05:04 +0000
3+++ CMakeLists.txt 2012-10-26 05:12:26 +0000
4@@ -87,7 +87,7 @@
5
6 add_executable(${NAME} ${VALA_C})
7
8-install(TARGETS ${NAME} RUNTIME DESTINATION /opt/extras.ubuntu.com/${NAME}/bin)
9+install(TARGETS ${NAME} RUNTIME DESTINATION /usr/bin)
10 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${NAME}.desktop DESTINATION share/applications)
11 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/gwoffice.svg DESTINATION share/icons/hicolor/48x48/apps)
12
13
14=== modified file 'data/gwoffice.desktop'
15--- data/gwoffice.desktop 2012-07-18 20:22:50 +0000
16+++ data/gwoffice.desktop 2012-10-26 05:12:26 +0000
17@@ -3,7 +3,7 @@
18 Name=GWoffice
19 Comment=Office Client for Google Drive (Docs)
20 GenericName=Google Office Client
21-Exec=/opt/extras.ubuntu.com/gwoffice/bin/gwoffice %U
22+Exec=/usr/bin/gwoffice %U
23 Icon=gwoffice
24 Terminal=false
25 Categories=Gnome;Gtk;Office;
26
27=== modified file 'data/org.gnome.gwoffice.gschema.xml'
28--- data/org.gnome.gwoffice.gschema.xml 2012-07-17 12:05:04 +0000
29+++ data/org.gnome.gwoffice.gschema.xml 2012-10-26 05:12:26 +0000
30@@ -65,5 +65,10 @@
31 <summary>Preferred format for spreadsheets</summary>
32 <description>Avoid to set this manually as it will crash things badly</description>
33 </key>
34+ <key name="sync-name" type="s">
35+ <default>"gwoffice"</default>
36+ <summary>Preferred folder name for synced documents</summary>
37+ <description>Sync folder will change only after restart</description>
38+ </key>
39 </schema>
40 </schemalist>
41
42=== modified file 'po/gwoffice.pot'
43--- po/gwoffice.pot 2012-07-17 12:05:04 +0000
44+++ po/gwoffice.pot 2012-10-26 05:12:26 +0000
45@@ -403,6 +403,18 @@
46 msgid "Always use Compact Controls:"
47 msgstr ""
48
49+#: /home/tom/Programming/gwoffice/po/../src/Widgets/Preferences.vala:51
50+msgid "Locations:"
51+msgstr ""
52+
53+#: /home/tom/Programming/gwoffice/po/../src/Widgets/Preferences.vala:52
54+msgid "Sync folder name:"
55+msgstr ""
56+
57+#: /home/tom/Programming/gwoffice/po/../src/Widgets/Preferences.vala:54
58+msgid "Note: Sync folder will change only after restart"
59+msgstr ""
60+
61 #: /home/tom/Programming/gwoffice/po/../src/Widgets/Preferences.vala:97
62 msgid "Preferred Formats:"
63 msgstr ""
64
65=== modified file 'src/GWoffice.vala'
66--- src/GWoffice.vala 2012-08-15 09:35:50 +0000
67+++ src/GWoffice.vala 2012-10-26 05:12:26 +0000
68@@ -99,7 +99,7 @@
69 login_data_file = File.new_for_path (data_folder.get_path ()+"/auth");
70 cookie_file = File.new_for_path (data_folder.get_path ()+"/cookies.txt");
71 etags_file = File.new_for_path (data_folder.get_path ()+"/etags");
72- sync_dir = File.new_for_path (Environment.get_home_dir ()+"/"+exec_name);
73+ sync_dir = File.new_for_path (Environment.get_home_dir ()+"/"+Services.Settings.get_default ().sync_name);
74
75 //if we have ambiance or radiance, switch to them
76 ubuntu_style = Services.Settings.get_default ().ubuntu_style == -1 ||
77
78=== modified file 'src/Services/Settings.vala'
79--- src/Services/Settings.vala 2012-07-02 19:42:17 +0000
80+++ src/Services/Settings.vala 2012-10-26 05:12:26 +0000
81@@ -11,6 +11,7 @@
82 public int ubuntu_style { get; set; }
83 public bool style { get; set; }
84 public bool always_show_compact_view { get; set; }
85+ public string sync_name { get; set; }
86
87 public bool open_uploaded { get; set; }
88 public bool download_docs { get; set; }
89
90=== modified file 'src/Widgets/Preferences.vala'
91--- src/Widgets/Preferences.vala 2012-07-17 12:05:04 +0000
92+++ src/Widgets/Preferences.vala 2012-10-26 05:12:26 +0000
93@@ -41,12 +41,20 @@
94 compact_view.active = Services.Settings.get_default ().always_show_compact_view;
95 compact_view.toggled.connect (() => Services.Settings.get_default ().always_show_compact_view = compact_view.active );
96
97+ var sync_name = new Gtk.Entry ();
98+ sync_name.text = Services.Settings.get_default ().sync_name;
99+ sync_name.changed.connect (() => Services.Settings.get_default ().sync_name = sync_name.text );
100+
101 grid_gen.attach (new LLabel.markup ("<b>"+_("Appearance:")+"</b>"), 0, 0, 1, 1);
102 grid_gen.attach (new LLabel.right (_("Apply Theme to Editor:")), 0, 1, 1, 1);
103 grid_gen.attach (style, 1, 1, 1, 1);
104 grid_gen.attach (new LLabel (_("Note: Theme is experimental and might cause GWoffice to crash")), 0, 2, 2, 1);
105 grid_gen.attach (new LLabel.right (_("Always use Compact Controls:")), 0, 3, 1, 1);
106 grid_gen.attach (compact_view, 1, 3, 1, 1);
107+ grid_gen.attach (new LLabel.markup ("<b>"+_("Locations:")+"</b>"), 0, 4, 1, 1);
108+ grid_gen.attach (new LLabel (_("Note: Sync folder will change only after restart")), 0, 5, 2, 1);
109+ grid_gen.attach (new LLabel.right (_("Sync folder name:")), 0, 6, 1, 1);
110+ grid_gen.attach (sync_name, 1, 6, 1, 1);
111
112 /*formats*/
113 var grid_formats = new Gtk.Grid ();

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: