[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdegraphics/kolourpaint
From:       Clarence Dang <dang () kde ! org>
Date:       2007-06-15 7:20:47
Message-ID: 1181892047.103479.8214.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 675802 by dang:

   * Add error dialogs for:
    - if scanning support is unavailable
    - running out of graphics memory during a scan



 M  +6 -0      NEWS  
 M  +15 -31    kpmainwindow_file.cpp  


--- branches/KDE/3.5/kdegraphics/kolourpaint/NEWS #675801:675802
@@ -2,6 +2,12 @@
 KolourPaint 1.4_relight Series (branches/KDE/3.5/)
 ===============================
 
+KolourPaint 1.4.8_relight (Frozen ???)
+
+   * Add error dialogs for:
+    - if scanning support is unavailable
+    - running out of graphics memory during a scan
+
 KolourPaint 1.4.7_relight (Frozen 2007-05-14)
 
    * Save local files atomically - KolourPaint will no longer truncate
--- branches/KDE/3.5/kdegraphics/kolourpaint/kpmainwindow_file.cpp #675801:675802
@@ -432,35 +432,19 @@
         #if DEBUG_KP_MAIN_WINDOW
             kdDebug () << "\tcould not create scan dialog" << endl;
         #endif
-            // STRING: We really need a dialog here.  We can't due to string freeze.
-            //         In order to signal to the user -- without a dialog -- that
-            //         scanning support is not installed, we disable the action
-            //         in every window.
+            // Instead, we could try to create the scan dialog in the ctor
+            // and just disable the action in the first place, removing
+            // the need for this dialog.
             //
-            //         Or we could try to create the scan dialog in the ctor
-            //         and just disable the action in the first place.  But
-            //         this increases startup time and is also too risky on
-            //         the stable branch (e.g. if the scan support hangs,
-            //         KolourPaint would not be able to be started at all).
-
-            // TODO: PROPAGATE: interprocess
-            if (KMainWindow::memberList)
-            {
-                for (QPtrList <KMainWindow>::const_iterator it = KMainWindow::memberList->begin ();
-                     it != KMainWindow::memberList->end ();
-                     it++)
-                {
-                    kpMainWindow *mw = dynamic_cast <kpMainWindow *> (*it);
-                    Q_ASSERT (mw);
-
-                #if DEBUG_KP_MAIN_WINDOW
-                    kdDebug () << "\t\tmw=" << mw << endl;
-                #endif
-
-                    mw->m_actionScan->setEnabled (false);
-                }
-            }
-
+            // But this increases startup time and is a bit risky e.g. if
+            // the scan support hangs, KolourPaint would not be able to be
+            // started at all.
+            //
+            // Also, disabling the action is bad because the scan support
+            // can be installed while KolourPaint is still running.
+            KMessageBox::sorry (this,
+                         i18n ("Scanning support is not installed."),
+                         i18n ("No Scanning Support"));
             return;
         }
 
@@ -540,9 +524,9 @@
     #if DEBUG_KP_MAIN_WINDOW
         kdDebug () << "\tcould not convert to pixmap" << endl;
     #endif
-        // STRING: After string freeze, we need a message like
-        //         "out of graphics memory" (see
-        //         kpDocument::getPixmapFromFile()).
+        KMessageBox::sorry (this,
+                            i18n ("Cannot scan - out of graphics memory."),
+                            i18n ("Cannot Scan"));
         return;
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]