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

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-07-06 13:41:41
Message-ID: 1152193301.737501.16223.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559030 by amantia:

Default to a better place when saving a global toolbar to the local toolbar directory \
and improve the error message if a toolbar cannot be saved.

CCBUG: 130236

 M  +3 -0      ChangeLog  
 M  +10 -10    quanta.kdevelop  
 M  +16 -4     src/quanta.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #559029:559030
@@ -6,6 +6,9 @@
       - make possible to remove a shortcut assigned to an action
       - don't become confused if exitting is cancelled during the toolbar
         saving process
+      - default to a better place when saving a global toolbar to the local
+        toolbar directory and improve the error message if a toolbar cannot be
+        saved [#130236]
 
 Version 3.5.3 (Release date: 23-05-2006; Started 18-03-2005):
  - bugfixes:
--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #559029:559030
@@ -18,7 +18,7 @@
     <absoluteprojectpath>false</absoluteprojectpath>
     <secondaryLanguages/>
     <versioncontrol/>
-    <defaultencoding/>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevautoproject>
     <general>
@@ -168,7 +168,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns></hidepatterns>
+      <hidepatterns/>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
@@ -191,16 +191,16 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
-      <dbgshell/>
-      <programargs/>
+      <dbgshell></dbgshell>
+      <programargs></programargs>
       <gdbpath>/usr/bin/gdb</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
       <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
       <staticmembers>false</staticmembers>
@@ -243,10 +243,10 @@
   </kdevcvs>
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" name="C++ header" create="template" >
+      <type icon="" ext="h" create="template" name="C++ header" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -267,7 +267,7 @@
     </codecompletion>
     <references/>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
--- branches/KDE/3.5/kdewebdev/quanta/src/quanta.cpp #559029:559030
@@ -2455,7 +2455,7 @@
   if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, \
false, this))  {
     KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> \
                toolbar.<br>"
-        "Check that you have write permissions \
for<br><b>%2</b></qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, \
KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); +        "Check that you \
have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save \
to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save \
Toolbars->Save as Local Toolbar</i> in this case. \
</qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), \
i18n("Toolbar Saving Error"));  tarFile = KURL();
     delete p_toolbar->dom;
     p_toolbar->dom = oldDom;
@@ -2506,7 +2506,19 @@
   {
     toolbarName = toolbarToSave;
   }
-
+  ToolbarEntry *p_toolbar = m_toolbarList[toolbarName];
+  QString toolbarFileName = p_toolbar->url.fileName();
+  QString toolbarRelPath = p_toolbar->url.url();
+  if (toolbarRelPath.startsWith("file://" + qConfig.globalDataDir))
+  {
+    toolbarRelPath.remove("file://" + qConfig.globalDataDir + resourceDir + \
"toolbars/"); +    toolbarRelPath.remove(toolbarFileName);
+  }
+  else
+  {
+    toolbarRelPath = "";
+  }
+  toolbarFileName.remove(".toolbar.tgz");
   if (destURL.isEmpty())
   {
     do {
@@ -2514,10 +2526,10 @@
 
       if (localToolbar)
       {
-        url = KFileDialog::getSaveURL(localToolbarsDir, "*"+toolbarExtension, this);
+        url = KFileDialog::getSaveURL(localToolbarsDir + toolbarRelPath + \
toolbarFileName, "*"+toolbarExtension, this);  } else
       {
-        url = KFileDialog::getSaveURL(Project::ref()->toolbarURL().url(), \
"*"+toolbarExtension, this); +        url = \
KFileDialog::getSaveURL(Project::ref()->toolbarURL().url() + toolbarFileName, \
"*"+toolbarExtension, this);  }
 
       if (url.isEmpty())


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