Eidete

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

  1. eidete
  2. Merge into trunk
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 Pending
Review via email: mp+224486@code.launchpad.net

This proposal supersedes a proposal from 2014-05-29.

This proposal has been superseded by a proposal from 2014-07-29.

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

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

review: Needs Fixing
Revision history for this message
Fabio Zaramella (fabiozaramella) wrote : Posted in a previous version of this proposal

is it ok now?

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-05-02 10:17:02 +0000
+++ CMakeLists.txt 2014-06-25 17:06:20 +0000
@@ -28,7 +28,7 @@
28add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs gstreamer-interfaces-0.10`)28add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs gstreamer-interfaces-0.10`)
2929
30find_package(PkgConfig)30find_package(PkgConfig)
31pkg_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)31pkg_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)
3232
33add_definitions(${DEPS_CFLAGS})33add_definitions(${DEPS_CFLAGS})
3434
@@ -79,4 +79,4 @@
79install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)79install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)
80install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)80install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)
81install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)81install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)
82install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)82install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
83\ No newline at end of file83\ No newline at end of file
8484
=== modified file 'src/eidete.vala'
--- src/eidete.vala 2013-05-17 19:55:20 +0000
+++ src/eidete.vala 2014-06-25 17:06:20 +0000
@@ -58,7 +58,7 @@
58 build_version = Constants.VERSION;58 build_version = Constants.VERSION;
59 build_version_info = Constants.VERSION_INFO;59 build_version_info = Constants.VERSION_INFO;
6060
61 app_years = "2011-2012";61 app_years = "2011-2014";
62 app_icon = "eidete";62 app_icon = "eidete";
63 app_launcher = "eidete.desktop";63 app_launcher = "eidete.desktop";
64 application_id = "net.launchpad.eidete";64 application_id = "net.launchpad.eidete";
@@ -104,12 +104,17 @@
104 Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;104 Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
105105
106 this.main_window = new Window ();106 this.main_window = new Window ();
107 this.main_window.title = program_name;
108 this.main_window.icon_name = exec_name;107 this.main_window.icon_name = exec_name;
109 this.main_window.set_application (this);108 this.main_window.set_application (this);
110 this.main_window.window_position = WindowPosition.CENTER;109 this.main_window.window_position = WindowPosition.CENTER;
111 this.main_window.set_resizable (false);110 this.main_window.set_resizable (false);
112111
112 /* Use CSD */
113 var header = new Gtk.HeaderBar ();
114 header.title = program_name;
115 header.set_show_close_button (true);
116 header.get_style_context ().remove_class ("header-bar");
117 this.main_window.set_titlebar (header);
113118
114 if (!this.main_window.is_composited ()){119 if (!this.main_window.is_composited ()){
115 warning ("Compositing is not supported. No transparency available.");120 warning ("Compositing is not supported. No transparency available.");
@@ -687,5 +692,4 @@
687 eidete = new Eidete.EideteApp ();692 eidete = new Eidete.EideteApp ();
688693
689 return eidete.run (args);694 return eidete.run (args);
690}695}
691
692\ No newline at end of file696\ No newline at end of file

Subscribers

People subscribed via source and target branches