SVN commit 818345 by tbraun:

CCMAIL: [EMAIL PROTECTED]

re-establish the possibility of creating new files from the structure view, bug 
introduced in r791271


 M  +1 -0      ChangeLog  
 M  +18 -17    kile/kilestructurewidget.cpp  


--- branches/extragear/kde3/office/kile/ChangeLog #818344:818345
@@ -3,6 +3,7 @@
 Fixes:
  - insert \item[] in description environments for smart newline (#161658),
  reported and fixed by Job Noorman
+ - fix regression in 2.0.1 inside structure view with opening files (debian 
#484146)
 
 Features:
  -
--- branches/extragear/kde3/office/kile/kile/kilestructurewidget.cpp 
#818344:818345
@@ -697,27 +697,28 @@
                                else
                                        emit(fileOpen(url, QString::null));
                        }
-                       else if( item->type() == KileStruct::Bibliography ){
-                               fname = 
m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::bibinputs);
-                               fi.setFile(fname);
-                               url.setPath(fname);
-                               if(fi.isReadable()){
-                                       emit(fileOpen(url, QString::null));
+                       else{
+                               QString otherFilename;
+
+                               if( item->type() == KileStruct::Bibliography ){
+                                       otherFilename = 
m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::bibinputs);
                                }
-                       }
-                       else if( item->type() == KileStruct::Input ){
-                               fname = 
m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::texinputs);
-                               fi.setFile(fname);
-                               url.setPath(fname);
+                               else if( item->type() == KileStruct::Input ){
+                                       otherFilename = 
m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::texinputs);
+                               }
+
+                               fi.setFile(otherFilename);
+
                                if(fi.isReadable()){
+                                       url.setPath(otherFilename);
                                        emit(fileOpen(url, QString::null));
                                }
-                       }
-                       else{
-                               if ( KMessageBox::warningYesNo(this, 
i18n("Cannot find the included file. The file does not exist, is not readable 
or Kile is unable to determine the correct path to it. The filename causing 
this error was: %1.\nDo you want to create this file?").arg(fname), 
i18n("Cannot Find File"))
-                       == KMessageBox::Yes)
-                               {
-                                       emit(fileNew(url));
+                               else{
+                                       if ( KMessageBox::warningYesNo(this, 
i18n("Cannot find the included file. The file does not exist, is not readable 
or Kile is unable to determine the correct path to it. The filename causing 
this error was: %1.\nDo you want to create this file?").arg(fname), 
i18n("Cannot Find File"))
+                               == KMessageBox::Yes) {
+                                               url.setPath(fname);
+                                               emit(fileNew(url));
+                                       }
                                }
                        }
                }



_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras

Reply via email to