Skip to content

Commit 857054b

Browse files
committed
Merge master
2 parents 8d76cbe + b3fa36f commit 857054b

7 files changed

Lines changed: 5 additions & 16 deletions

File tree

data/Application.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383

8484
.cell.dim-label .event {
85-
background: alpha (@base_color, 0.7);
85+
background: alpha(@base_color, 0.7);
8686
color: @text_color;
8787
}
8888

@@ -94,8 +94,8 @@ row:selected .event {
9494
background: @base_color;
9595
background-image: linear-gradient(to right, @selected_bg_color, @selected_bg_color);
9696
box-shadow:
97-
0 1px 2px alpha (#000, 0.2),
98-
0 1px 3px alpha (@selected_bg_color, 0.15);
97+
0 1px 2px alpha(#000, 0.2),
98+
0 1px 3px alpha(@selected_bg_color, 0.15);
9999
color: @selected_fg_color;
100100
}
101101

@@ -106,7 +106,7 @@ row:selected .event {
106106
}
107107

108108
#today #date {
109-
background-color: alpha (@accent_color, 0.15);
109+
background-color: alpha(@accent_color, 0.15);
110110
color: @accent_color;
111111
font-weight: 700;
112112
}

src/EventEdition/EventDialog.vala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ public class EventDialog : Granite.Dialog {
3232
public ECal.Component original_ecal { get; private set; }
3333
public DateTime date_time { get; set; }
3434

35-
/**
36-
* A boolean indicating whether we can edit the current event.
37-
*/
38-
public bool can_edit = true;
39-
4035
private ECal.ObjModType mod_type { get; private set; default = ECal.ObjModType.ALL; }
4136
private EventType event_type { get; private set; }
4237

src/EventEdition/GuestsPanel.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public class Maya.View.EventEdition.GuestsPanel : Gtk.Box {
3232

3333
construct {
3434
attendees = new Gee.ArrayList<unowned ICal.Property> ();
35-
3635
guest_store = new Gtk.ListStore (2, typeof (string), typeof (string));
3736

3837
load_contacts.begin ();

src/EventEdition/InfoPanel.vala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public class Maya.View.EventEdition.InfoPanel : Gtk.Grid {
7575
margin_start = 12;
7676
margin_end = 12;
7777
column_spacing = 12;
78-
sensitive = parent_dialog.can_edit;
7978

8079
var from_label = new Granite.HeaderLabel (_("From:"));
8180

@@ -205,7 +204,7 @@ public class Maya.View.EventEdition.InfoPanel : Gtk.Grid {
205204
// Row: title & calendar
206205
attach (title_label, 0, 0, 1, 1);
207206
attach (title_entry, 0, 1, 1, 1);
208-
if (calchooser.sources.length () > 1 && parent_dialog.can_edit) {
207+
if (calchooser.sources.length () > 1) {
209208
attach (calendar_label, 1, 0, 4, 1);
210209
attach (calendar_button, 1, 1, 4, 1);
211210
}

src/EventEdition/LocationPanel.vala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public class Maya.View.EventEdition.LocationPanel : Gtk.Box {
6363
champlain_embed = new GtkChamplain.Embed ();
6464

6565
point = new Maya.Marker ();
66-
point.draggable = parent_dialog.can_edit;
6766
point.drag_finish.connect (() => {
6867
map_selected = true;
6968
find_location.begin (point.latitude, point.longitude);
@@ -89,7 +88,6 @@ public class Maya.View.EventEdition.LocationPanel : Gtk.Box {
8988
margin_end = 12;
9089
orientation = VERTICAL;
9190
spacing = 6;
92-
sensitive = parent_dialog.can_edit;
9391
add (location_label);
9492
add (location_entry);
9593
add (frame);

src/EventEdition/ReminderPanel.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public class Maya.View.EventEdition.ReminderPanel : Gtk.Box {
6464

6565
margin_start = margin_end = 12;
6666
orientation = VERTICAL;
67-
sensitive = parent_dialog.can_edit;
6867
add (reminder_label);
6968
add (frame);
7069

src/EventEdition/RepeatPanel.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
2929

3030
public RepeatPanel (EventDialog parent_dialog) {
3131
this.parent_dialog = parent_dialog;
32-
sensitive = parent_dialog.can_edit;
3332

3433
var reminder_label = new Granite.HeaderLabel (_("Repeat:"));
3534

0 commit comments

Comments
 (0)