← Back to branch summary

~mcbits/maya/fix-1420633

« back to all changes in this revision

Viewing changes to Maya/View/MayaWindow.vala

  • Committer: Aiman Baharna
  • Date: 2011-10-29 12:26:52 UTC
  • mfrom: (87.2.8 mvc)
  • mto: (87.1.26 backend)
  • mto: This revision was merged to the branch mainline in revision 105.
  • Revision ID: aiman@globalstatic.net-20111029122652-nq51wbtdswmml1mg
Merged with MVC branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
Maya/View/MayaWindow.vala
15
15
//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
16
// 
17
17
 
18
 
using Gtk;
19
 
using Gdk;
20
 
 
21
18
using Granite.Widgets;
22
19
using Granite.Services;
23
20
 
24
21
using Maya;
25
22
 
26
 
namespace Maya.Widgets {
 
23
namespace Maya.View {
27
24
 
28
25
        public class MayaWindow : Gtk.Window {
29
26
                
30
 
                public static CssProvider style_provider { get; private set; default = null; }
31
 
                
32
 
                public static SavedState saved_state { get; private set; default = null; }
33
 
                
34
 
                public static MayaSettings prefs { get; private set; default = null; }
35
 
                
36
 
                private VBox vbox;
 
27
                public static Gtk.CssProvider style_provider { get; private set; default = null; }
 
28
                
 
29
                public static Settings.SavedState saved_state { get; private set; default = null; }
 
30
                
 
31
                public static Settings.MayaSettings prefs { get; private set; default = null; }
 
32
                
 
33
                private Gtk.VBox vbox;
37
34
                public MayaToolbar toolbar { get; private set; }
38
 
                public HPaned hpaned { get; private set; }
39
 
                public CalendarView calendar_view { get; private set; }
 
35
                public Gtk.HPaned hpaned { get; private set; }
 
36
                public Calendar.View calendar_view { get; private set; }
40
37
                public Sidebar sidebar { get; private set; }
41
38
                
42
39
                public static Granite.Application app { get; private set; }
46
43
                        this.app = app;
47
44
                        
48
45
                        // Set up global css provider
49
 
                        style_provider = new CssProvider ();
 
46
                        style_provider = new Gtk.CssProvider ();
50
47
                        try {
51
48
                                style_provider.load_from_path (Build.PKGDATADIR + "/style/default.css");
52
49
                        } catch (Error e) {
54
51
                        }
55
52
                        
56
53
                        // Set up settings
57
 
                        saved_state = new SavedState ();
58
 
                        prefs = new MayaSettings ();
 
54
                        saved_state = new Settings.SavedState ();
 
55
                        prefs = new Settings.MayaSettings ();
59
56
                        
60
 
                        vbox = new VBox (false, 0);
 
57
                        vbox = new Gtk.VBox (false, 0);
61
58
                        toolbar = new MayaToolbar (this);
62
 
                        hpaned = new HPaned ();
63
 
                        calendar_view = new CalendarView (this);
 
59
                        hpaned = new Gtk.HPaned ();
 
60
                        calendar_view = new Calendar.View (this);
64
61
                        sidebar = new Sidebar (this);
65
62
                        
66
63
                        // Window Properties
83
80
                        destroy.connect (Gtk.main_quit);
84
81
                }
85
82
                
86
 
                protected override bool delete_event (EventAny event) {
 
83
                protected override bool delete_event (Gdk.EventAny event) {
87
84
                        update_saved_state ();
88
85
                        return false;
89
86
                }
94
91
                        default_width = saved_state.window_width;
95
92
                        default_height = saved_state.window_height;
96
93
                        
97
 
                        if (saved_state.window_state == MayaWindowState.MAXIMIZED)
 
94
                        if (saved_state.window_state == Settings.WindowState.MAXIMIZED)
98
95
                                maximize ();
99
 
                        else if (saved_state.window_state == MayaWindowState.FULLSCREEN)
 
96
                        else if (saved_state.window_state == Settings.WindowState.FULLSCREEN)
100
97
                                fullscreen ();
101
98
                        
102
99
                        hpaned.position = saved_state.hpaned_position;
105
102
                private void update_saved_state () {
106
103
                        
107
104
                        // Save window state
108
 
                        if ((get_window ().get_state () & WindowState.MAXIMIZED) != 0)
109
 
                                saved_state.window_state = MayaWindowState.MAXIMIZED;
110
 
                        else if ((get_window ().get_state () & WindowState.FULLSCREEN) != 0)
111
 
                                saved_state.window_state = MayaWindowState.FULLSCREEN;
 
105
                        if ((get_window ().get_state () & Settings.WindowState.MAXIMIZED) != 0)
 
106
                                saved_state.window_state = Settings.WindowState.MAXIMIZED;
 
107
                        else if ((get_window ().get_state () & Settings.WindowState.FULLSCREEN) != 0)
 
108
                                saved_state.window_state = Settings.WindowState.FULLSCREEN;
112
109
                        else
113
 
                                saved_state.window_state = MayaWindowState.NORMAL;
 
110
                                saved_state.window_state = Settings.WindowState.NORMAL;
114
111
                        
115
112
                        // Save window size
116
 
                        if (saved_state.window_state == MayaWindowState.NORMAL) {
 
113
                        if (saved_state.window_state == Settings.WindowState.NORMAL) {
117
114
                                int width, height;
118
115
                                get_size (out width, out height);
119
116
                                saved_state.window_width = width;