Merge lp:~fabiozaramella/eidete/eidete into lp:eidete

Proposed by Fabio Zaramella
Status: Superseded
Proposed branch: lp:~fabiozaramella/eidete/eidete
Merge into: lp:eidete
Diff against target: 59 lines (+10/-6)
2 files modified
CMakeLists.txt (+2/-2)
src/eidete.vala (+8/-4)
To merge this branch: bzr merge lp:~fabiozaramella/eidete/eidete
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
Review via email: mp+221424@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-25.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

Code is out of alignment and the required gtk version needs to be updated in CMakeLists.txt

review: Needs Fixing
lp:~fabiozaramella/eidete/eidete updated
171. By Fabio

aligned

172. By Fabio

aligned

Revision history for this message
Fabio Zaramella (fabiozaramella) wrote :

is it ok now?

Unmerged revisions

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 2013-05-02 10:17:02 +0000
3+++ CMakeLists.txt 2014-05-29 17:08:33 +0000
4@@ -28,7 +28,7 @@
5 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs gstreamer-interfaces-0.10`)
6
7 find_package(PkgConfig)
8-pkg_check_modules(DEPS REQUIRED gtk+-3.0 libwnck-3.0 gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 granite xtst gdk-x11-3.0 x11)
9+pkg_check_modules(DEPS REQUIRED gtk+-3.0>=3.10 libwnck-3.0 gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 granite xtst gdk-x11-3.0 x11)
10
11 add_definitions(${DEPS_CFLAGS})
12
13@@ -79,4 +79,4 @@
14 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)
15 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)
16 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)
17-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
18+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
19\ No newline at end of file
20
21=== modified file 'src/eidete.vala'
22--- src/eidete.vala 2013-05-17 19:55:20 +0000
23+++ src/eidete.vala 2014-05-29 17:08:33 +0000
24@@ -58,7 +58,7 @@
25 build_version = Constants.VERSION;
26 build_version_info = Constants.VERSION_INFO;
27
28- app_years = "2011-2012";
29+ app_years = "2011-2014";
30 app_icon = "eidete";
31 app_launcher = "eidete.desktop";
32 application_id = "net.launchpad.eidete";
33@@ -104,12 +104,17 @@
34 Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
35
36 this.main_window = new Window ();
37- this.main_window.title = program_name;
38 this.main_window.icon_name = exec_name;
39 this.main_window.set_application (this);
40 this.main_window.window_position = WindowPosition.CENTER;
41 this.main_window.set_resizable (false);
42
43+ /* Use CSD */
44+ var header = new Gtk.HeaderBar ();
45+ header.title = program_name;
46+ header.set_show_close_button (true);
47+ header.get_style_context ().remove_class ("header-bar");
48+ this.main_window.set_titlebar (header);
49
50 if (!this.main_window.is_composited ()){
51 warning ("Compositing is not supported. No transparency available.");
52@@ -687,5 +692,4 @@
53 eidete = new Eidete.EideteApp ();
54
55 return eidete.run (args);
56-}
57-
58+}
59\ No newline at end of file

Subscribers

People subscribed via source and target branches