SVN commit 582429 by amantia:

Improve usability of the File Changed dialog.

BUG: 126058
CCMAIL: kde-i18n-doc@kde.org

 M  +1 -1      ChangeLog  
 M  +3 -1      dialogs/dirtydlg.cpp  
 M  +10 -10    quanta.kdevelop  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #582428:582429
@@ -22,8 +22,8 @@
 
  - improvements:
       - make CSS completion work inside style attributes [#80605]
+      - improve usability of the File Changed dialog [#126058]
 
-
 Version 3.5.4 (Release date: 02-08-2006; Started 24-06-2005):
  - bugfixes:
       - make Open File in context menu work for remote projects as well
--- branches/KDE/3.5/kdewebdev/quanta/dialogs/dirtydlg.cpp #582428:582429
@@ -15,6 +15,7 @@
 
 //qt includes
 #include <qevent.h>
+#include <qlabel.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
@@ -33,13 +34,14 @@
 #include "resource.h"
 #include "qextfileinfo.h"
 
-DirtyDlg::DirtyDlg(const QString& srcName, const QString& destName, bool createBackup, QWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok | KDialogBase::Cancel)
+DirtyDlg::DirtyDlg(const QString& srcName, const QString& destName, bool createBackup, QWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok)
 {
  m_src.setPath(srcName);
  m_dest.setPath(destName);
  m_busy = false;
  m_createBackup = createBackup;
  m_mainWidget = new DirtyDialog(this);
+ m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").arg(srcName));
  setMainWidget(m_mainWidget);
 }
 
--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #582428:582429
@@ -19,7 +19,7 @@
     <absoluteprojectpath>false</absoluteprojectpath>
     <secondaryLanguages/>
     <versioncontrol/>
-    <defaultencoding/>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevautoproject>
     <general>
@@ -170,7 +170,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns></hidepatterns>
+      <hidepatterns/>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
@@ -193,16 +193,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>
@@ -245,10 +245,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>
@@ -280,7 +280,7 @@
       <pcs>KDElibs3</pcs>
     </references>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>