Merge lp:~b-beelitz/maya/fix-1080349 into lp:~elementary-apps/maya/trunk

[Benjamin Beelitz]

The add popover event now always have the actual time of the PC. The Edit Dialog is not affected.

[Raphael Isemann (teemperor)]

That review looks like it is already got merged? At least that "actual" time of the PC thing and so on. Can you give me a feedback if this merge request is still necessary?

[Benjamin Beelitz (b-beelitz)]

Hi

I don't know. You mean the fix that maya has been renamed? I don´t know if
my fix is merged and necessary. It was an bug. I don´t know if there is
still an bug. Sorry.

Benjamin
Am 02.05.2013 18:28 schrieb "Raphael Isemann" <email address hidden>:

> That review looks like it is already got merged? At least that "actual"
> time of the PC thing and so on. Can you give me a feedback if this merge
> request is still necessary?
> --
> https://code.launchpad.net/~b-beelitz/maya/fix-1080349/+merge/141369
> You are the owner of lp:~b-beelitz/maya/fix-1080349.
>

[David Gomes (davidgomes)]

>2012-12-27
December of 2012 was just too long ago.

review: Needs Resubmitting

Unmerged revisions

391. By Benjamin Beelitz on 2012-12-27

The add popover event now always have the actual time of the PC. The edit PopOver has the Event-Time and so on. It's pretty cool know

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-20 12:36:36 +0000
+++ CMakeLists.txt	2012-12-27 16:05:27 +0000
@@ -145,9 +145,9 @@
     )
 
 add_definitions(${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes )
-add_executable(maya ${VALA_C})
+add_executable(maya-calendar ${VALA_C})
 
-install(TARGETS maya RUNTIME DESTINATION bin)
+install(TARGETS maya-calendar RUNTIME DESTINATION bin)
 
 #
 # GSettings Schema

=== modified file 'Maya/Application.vala'
--- Maya/Application.vala	2012-11-23 17:22:11 +0000
+++ Maya/Application.vala	2012-12-27 16:05:27 +0000
@@ -284,7 +284,9 @@
         void on_modified (E.CalComponent comp) {
             var dialog = new Maya.View.EventDialog (window, sourcemgr, comp, comp.get_data<E.Source>("source"), false);
             dialog.response.connect ((response_id) => on_event_dialog_response(dialog, response_id, false));
+            dialog.load();
             dialog.present ();
+            
         }
 
         /**

=== modified file 'Maya/View/EventDialog.vala'
--- Maya/View/EventDialog.vala	2012-09-16 17:10:50 +0000
+++ Maya/View/EventDialog.vala	2012-12-27 16:05:27 +0000
@@ -112,7 +112,7 @@
             build_dialog (add_event);
 
             // Load the event's properties in to the dialog
-            load ();
+           // load ();
 
             update_create_sensitivity ();
         }
@@ -215,7 +215,7 @@
         /**
          * Populate the dialog's widgets with the component's values.
          */
-        void load () {
+        public void load () {
 
             unowned iCal.icalcomponent comp = ecal.get_icalcomponent ();
 
@@ -322,9 +322,15 @@
 
             to_date_picker = make_date_picker ();
             to_date_picker.notify["date"].connect ( () => {on_date_modified(1);} );
+
+
+            DateTime from_time = new DateTime.now_local();
+            DateTime to_time = new DateTime.now_local();
+            
             to_time_picker = make_time_picker ();
             to_time_picker.time_changed.connect ( () => {on_time_modified(1);} );
 
+
             allday_switch_grid.attach (allday_switch, 0, 0, 1, 1);
 
             allday_switch_grid.set_valign (Gtk.Align.CENTER);

=== modified file 'data/maya.desktop'
--- data/maya.desktop	2012-11-09 21:43:42 +0000
+++ data/maya.desktop	2012-12-27 16:05:27 +0000
@@ -4,7 +4,7 @@
 Name=Maya
 GenericName=Calendar
 Comment=View and schedule events
-Exec=maya
+Exec=maya-calendar
 Icon=office-calendar
 Terminal=false
 Categories=GTK;Office;Calendar;
@@ -16,5 +16,5 @@
 
 [AddEvent Shortcut Group]
 Name=_Add Event
-Exec=maya -a
+Exec=maya-calendar -a
 TargetEnvironment=Unity