Changeset 7092:b441c0421584 in orange

Timestamp:

11/17/10 16:48:02 (3 years ago)

Author:

ales_erjavec <ales.erjavec@…>

Branch:

default

Convert:

0aea56ba96f8aa21a0f3c4ca372ec979e3129269

Message:

• changed caption for open file dialogs from "Open File" to "Open Orange Schema"
• changed the way canvas geometry is restored on restart (Problem with unified title bar on MacOS X)

File:

• orange/OrangeCanvas/orngCanvas.pyw (modified) (4 diffs)

orange/OrangeCanvas/orngCanvas.pyw

@@ -137 +137 @@
         self.toolbar.addWidget(w)
         
+        # Restore geometry before calling createWidgetsToolbar.
+        # On Mac OSX with unified title bar the canvas can move up on restarts
+        state = self.settings.get("CanvasMainWindowGeometry", None)
+        if state is not None:
+            state = self.restoreGeometry(QByteArray(state))
+            width, height = self.width(), self.height()
+        
+        if not state:
+            width, height = self.settings.get("canvasWidth", 700), self.settings.get("canvasHeight", 600)
+
+        # center window in the desktop
+        # on multiheaded desktops it it does not fit
+        
+        desktop = qApp.desktop()
+        space = desktop.availableGeometry(self)
+        geometry, frame = self.geometry(), self.frameGeometry()
+        
+        #Fit the frame size to fit in space
+        width = min(space.width() - (frame.width() - geometry.width()), geometry.width())
+        height = min(space.height() - (frame.height() - geometry.height()), geometry.height())
+        
+        self.resize(width, height)
+        
         self.addToolBarBreak()
         orngTabs.constructCategoriesPopup(self)
@@ -152 +175 @@
         self.readRecentFiles()
 
-        state = self.settings.get("CanvasMainWindowGeometry", None)
-        if state is not None:
-            state = self.restoreGeometry(QByteArray(state))
-            width, height = self.width(), self.height()
-        
-        if not state:
-            width, height = self.settings.get("canvasWidth", 700), self.settings.get("canvasHeight", 600)
-
-        # center window in the desktop
-        # on multiheaded desktops it it does not fit
-        
-        desktop = qApp.desktop()
-        space = desktop.availableGeometry(self)
-        geometry, frame = self.geometry(), self.frameGeometry()
-        
-        #Fit the frame size to fit in space
-        width = min(space.width() - (frame.width() - geometry.width()), geometry.width())
-        height = min(space.height() - (frame.height() - geometry.height()), geometry.height())
-        
-        self.resize(width, height)
-        
-        #move to center if frame not fully contained in space TODO: move to side of the space not the center
+        
+        
+        #move to center if frame not fully contained in space
         if not space.contains(self.frameGeometry()):
             x = max(0, space.width() / 2 - width / 2)
@@ -376 +380 @@
         
     def menuItemOpen(self):
-        name = QFileDialog.getOpenFileName(self, "Open File", self.settings["saveSchemaDir"], "Orange Widget Scripts (*.ows)")
+        name = QFileDialog.getOpenFileName(self, "Open Orange Schema", self.settings["saveSchemaDir"], "Orange Widget Scripts (*.ows)")
         if name.isEmpty():
             return
@@ -384 +388 @@
 
     def menuItemOpenFreeze(self):
-        name = QFileDialog.getOpenFileName(self, "Open File", self.settings["saveSchemaDir"], "Orange Widget Scripts (*.ows)")
+        name = QFileDialog.getOpenFileName(self, "Open Orange Schema", self.settings["saveSchemaDir"], "Orange Widget Scripts (*.ows)")
         if name.isEmpty():
             return