[common] Fixed problem with opening of already opened files (#363)

Author: deniskoronchik

docs/changelog.html

@@ -24,6 +24,8 @@
     <li class="fix">Fixed plugin loading on linux</li>
     <li class="fix">Fixed dock widget positions save/load</li>
     <li class="fix">Fixed main window title</li>
+    <li class="fix">Fixed problems with opening already opened files <p class="comment">Now if file already opened, then it makes tab active</p></li>
+    <li class="change">Change license to MIT</li>
 
     <p class="header">SCg-editor</p>
     <li class="add">Added load/save of content state</li>
@@ -38,6 +40,7 @@
 
     <p class="header">SCs editor</p>
     <li class="add">Added support of scs 0.2.0 standard</li>
+    <li class="add">Added new line into the end of file<p class="comment">Less lines changes in diff's</p></li>
     <li class="fix">Fixed default encoding to utf-8</li>
 
 </ul>

sources/kbe/extendedtabwidget.cpp

@@ -79,11 +79,12 @@ bool ExtendedTabWidget::closeWindow(QWidget* wnd)
                "bool ExtendedTabWidget::close(int index)",
                "Can't get window");
 
-    if(emit tabBeforeClose(wnd))
+    if (emit tabBeforeClose(wnd))
     {
         wnd->close();
         removeTab(indexOf(wnd));
         delete wnd;
+
         tabsUpdate();
         return true;
     }
@@ -95,12 +96,26 @@ QList<QWidget*> ExtendedTabWidget::subWindowList() const
 {
     QList<QWidget*> res;
     int cnt = count();
-    for(int i =0; i < cnt; ++i)
+    for (int i = 0; i < cnt; ++i)
         res.push_back(widget(i));
 
     return res;
 }
 
+bool ExtendedTabWidget::activateTab(QString const & fileName)
+{
+    for (int i = 0; i < count(); ++i)
+    {
+        EditorInterface const * editor = qobject_cast<EditorInterface*>(widget(i));
+        if (editor && editor->currentFileName() == fileName)
+        {
+            setCurrentWidget(widget(i));
+            return true;
+        }
+    }
+    return false;
+}
+
 void ExtendedTabWidget::closeOtherDocuments()
 {
     QWidget* currentWindow = currentWidget();

sources/kbe/extendedtabwidget.h

@@ -27,9 +27,14 @@ class ExtendedTabWidget : public QTabWidget
      */
     bool closeWindow(QWidget* wnd);
 
-    //!@return list with tab widgets;
+    //! @return list with tab widgets;
     QList<QWidget*> subWindowList() const;
 
+    /*! Makes tab active by filename
+     * @return If specified tab exists, then returns true; otherwise returns false
+     */
+    bool activateTab(QString const & fileName);
+
 protected:
     //! Watches for all child widgets (windows).
     bool eventFilter (QObject* watched, QEvent* event);
@@ -39,7 +44,7 @@ class ExtendedTabWidget : public QTabWidget
      * @param w Widget in closed tab.
      * @return True, if tab will be closed.
      */
-    bool tabBeforeClose(QWidget* w);
+    bool tabBeforeClose(QWidget * w);
 
     /*! Tabs updated signal. Calls when new tab added, or any tab removed.
       */

sources/kbe/mainwindow.cpp

@@ -388,28 +388,22 @@ void MainWindow::fileOpen(QString fileName)
         mBlurEffect->setEnabled(true);
         dlg.setDirectory(mLastDir);
         fileName = dlg.getOpenFileName(this,
-                                               tr("Open file"),
-                                               "",
-                                               PluginManager::instance()->openFilters(),
-                                               &selectedFilter,
-                                               options);
-        if (!fileName.isEmpty())
-            load(fileName);
+                                       tr("Open file"),
+                                       "",
+                                       PluginManager::instance()->openFilters(),
+                                       &selectedFilter,
+                                       options);
         mLastDir = QDir(fileName);
         mBlurEffect->setEnabled(false);
-        return;
     }
 
     if (!fileName.isEmpty() && QFile::exists(fileName))
     {
-        load(fileName);
+        if (!mTabWidget->activateTab(fileName))
+            load(fileName);
         return;
     }
 
-    QFileInfo fileInfo(fileName);
-    EditorInterface* childWindow = createSubWindowByExt(fileInfo.suffix());
-    saveWindow(childWindow, fileName, fileInfo.suffix());
-
 }
 
 void MainWindow::load(QString fileName)

tools/DEBIAN/changelog

@@ -7,6 +7,8 @@ kbe (0.3.1-ubuntu) unstable; urgency=low
   * Fixed dock widget positions save/load
   * Fixed main window title
   * Port code to use qt5
+  * Change license to MIT
+  * Fixed problems with opening of already opened files
 
   * scg. Added load/save of content state
   * scg. Added command to show/hide all contents
@@ -17,8 +19,9 @@ kbe (0.3.1-ubuntu) unstable; urgency=low
   * scg. Fixed visual style of scg-elements
   * scg. Fixed default encoding to utf-8
 
-  * scg. Added support of scs 0.2.0 standard
-  * scg. Fixed default encoding to utf-8
+  * scs. Added support of scs 0.2.0 standard
+  * scs. Fixed default encoding to utf-8
+  * scs. Added new line into the end of file
 
  -- Denis Koronchik <denis.koronchik@gmail.com>  Tue, 5 May 2014 01:06:43 +0300