Changeset 176:e4cebe9dc525 for source/class/pf

Timestamp:

Jan 20, 2010, 12:29:51 PM (14 years ago)

Author:

fnevgeny

Branch:

default

Phase:

public

Message:

Use newly added dialogs.

File:

• source/class/pf/Application.js (modified) (15 diffs)

source/class/pf/Application.js

@@ -1700 +1700 @@
                 this.prefs.currentConfigName != "Untitled") {
                 if (this.saveConfig(this.prefs.currentConfigName) != true) {
-                    alert("Save failed!");
+                    this.msgWindow.error("Save failed!");
                 }
             } else {
@@ -1720 +1720 @@
             
             w.open();
+        },
+        
+        restart : function(force)
+        {
+            if (force || this.intendedExit || !this.prefs.warnOnExit) {
+                location.reload(true);
+            } else {
+                this.confirmDialog.confirm("Restart Plasma Formulary?",
+                    function(yesno) {
+                            if (yesno) {
+                                this.intendedExit = true;
+                                this.restart(true);
+                            }
+                        }, this);
+            }
+        },
+        
+        quit : function(force)
+        {
+            if (force || this.intendedExit || !this.prefs.warnOnExit) {
+                window.close(true);
+            } else {
+                this.confirmDialog.confirm("Quit Plasma Formulary?",
+                    function(yesno) {
+                            if (yesno) {
+                                this.intendedExit = true;
+                                this.quit(true);
+                            }
+                        }, this);
+            }
         },
         
@@ -1751 +1781 @@
             q = new qx.ui.core.Command("Ctrl+R");
             q.addListener("execute", function(ev) {
-                    if (!this.prefs.warnOnExit ||
-                        confirm("Restart Plasma Formulary?")) {
-                        this.intendedExit = true;
-                        location.reload(true);
-                    }
+                    this.restart(false);
                 }, this);
             btn = new qx.ui.menu.Button("Restart", "pf/image/reset.png", q);
@@ -1762 +1788 @@
             q = new qx.ui.core.Command("Ctrl+Q");
             q.addListener("execute", function(ev) {
-                    if (!this.prefs.warnOnExit ||
-                        confirm("Quit Plasma Formulary?")) {
-                        this.intendedExit = true;
-                        window.close();
-                    }
+                    this.quit(false);
                 }, this);
             btn = new qx.ui.menu.Button("Quit", "pf/image/exit.png", q);
@@ -1877 +1899 @@
             q = new qx.ui.core.Command("F1");
             q.addListener("execute", function(ev) {
-                alert("Help system not implemented yet");
-            });
+                this.msgWindow.info("Help system not implemented yet.");
+                }, this);
             btn = new qx.ui.menu.Button("Help Contents",
                 "pf/image/help.png", q);
@@ -2112 +2134 @@
             w.setContentPadding(0);
                 
-            this.doc.add(w, {left: 200, top: 100});
+            this.doc.add(w);
             this.saveLoadWindow = w;
 
@@ -2162 +2184 @@
                         var rowData = tm.getRowData(index);
                         var name = rowData[0];
-                        if (confirm("Delete \"" + name + "\"?")) {
-                            var index = sm.getLeadSelectionIndex();
-                            var rowData = tm.getRowData(index);
-                            this.removeConfig(rowData[0]);
-                            this.updateSaveLoadList();
+                        if (name == this.prefs.currentConfigName) {
+                            this.msgWindow.error("Cannot delete current configuration!");
+                        } else {
+                            this.confirmDialog.confirm("Delete \"" + name + "\"?",
+                                function(yesno) {
+                                        if (yesno) {
+                                            this.removeConfig(name);
+                                            this.updateSaveLoadList();
+                                        }
+                                    }, this);
                         }
                     }
@@ -2176 +2203 @@
                         var rowData = tm.getRowData(index);
                         var name = rowData[0];
-                        var newname = prompt("Rename \"" + name + "\" to", name);
-                        if (newname && newname != name) {
-                            this.renameConfig(name, newname);
-                            this.updateSaveLoadList();
-                            if (name == this.prefs.currentConfigName) {
-                                this.prefs.currentConfigName = newname;
-                                this.gui_configName.setLabel(newname);
-                            }
-                            this.saveLoadTextField.setValue(newname);
-                        }
+                        
+                        
+                        this.promptDialog.prompt("Rename \"" + name + "\" to",
+                            name, function(newname) {
+                                    if (newname  && newname != name) {
+                                        this.renameConfig(name, newname);
+                                        this.updateSaveLoadList();
+                                        if (name == this.prefs.currentConfigName) {
+                                            this.prefs.currentConfigName = newname;
+                                            this.gui_configName.setLabel(newname);
+                                        }
+                                        this.saveLoadTextField.setValue(newname);
+                                    }
+                                }, this);
                     }
                 }, this);
@@ -2226 +2257 @@
                     var cfgname = this.saveLoadTextField.getValue(); 
                     if (!cfgname) {
-                        alert("Please enter a name!");
+                        this.msgWindow.error("Please enter a name!");
                     } else {
                         var type = w.getUserData("type");
@@ -2236 +2267 @@
                                 }
                             } else {
-                                alert("Save failed!");
+                                this.msgWindow.error("Save failed!");
                             }
                         } else {
@@ -2244 +2275 @@
                                 this.saveLoadWindow.close();
                             } else {
-                                alert("Load failed!");
+                                this.msgWindow.error("Load failed!");
                             }
                         }
@@ -2265 +2296 @@
             w.setLayout(new qx.ui.layout.VBox(10));
 
-            this.doc.add(w, {left: 200, top: 100});
+            this.doc.add(w);
             this.prefsWindow = w;
             
@@ -2355 +2386 @@
                     this.prefs.themeName = btn.getModel();
                     
-                    // this.applyTheme();
-                    alert("New theme will be applied after restart of the application");
+                    this.msgWindow.info("New theme will be applied after restart of the application");
                 }, this);
 
@@ -2394 +2424 @@
             
             this.doc = this.getRoot();
-            // this.win = this.doc.getWindow();
             
             // Load prefs
@@ -2474 +2503 @@
             w.add(a);
 
-            this.doc.add(w, {left: 200, top: 100});
+            this.doc.add(w);
             this.aboutWindow = w;
+            
+            this.msgWindow = new pf.ui.MessageWindow();
+            this.doc.add(this.msgWindow);
+            this.confirmDialog = new pf.ui.ConfirmDialog();
+            this.doc.add(this.confirmDialog);
+            this.promptDialog = new pf.ui.PromptDialog();
+            this.doc.add(this.promptDialog);
             
             // Handle resize events