ability to re-open file in different charset from FM panel, not just …

…from File - Reload
aerowolf · May 18, 2017 · 92f2aee · 92f2aee
1 parent 0e4fb7e
commit 92f2aee
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,5 @@
 Code and design:
-Peter 'Roxton' Semiletov <[email protected], http://semiletov.org>
+Peter 'Roxton' Semiletov <[email protected], http://semiletov.org>
 
 PHP hl module by Boo-boo.
 

diff --git a/document.cpp b/document.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   2007-2016 by Peter Semiletov                                          *
- *   [email protected]                                                           *
+ *   [email protected]                                                           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -403,6 +403,7 @@ CDocument* document_holder::open_file (const QString &fileName, const QString &c
   if (d)
      {
       tab_widget->setCurrentIndex (tab_widget->indexOf (d->tab_page));
+      d->reload (codec);
       return d;
      }
 

diff --git a/document.h b/document.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   2007-2017 by Peter Semiletov <[email protected]>                            *
+ *   2007-2017 by Peter Semiletov <[email protected]>                            *
  *                                                                         *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

diff --git a/fman.cpp b/fman.cpp
@@ -1,6 +1,6 @@
  /**************************************************************************
- *   2007-2016 by Peter Semiletov                                          *
- *   [email protected]                                                           *
+ *   2007-2017 by Peter Semiletov                                          *
+ *   [email protected]                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *

diff --git a/fman.h b/fman.h
@@ -1,6 +1,6 @@
  /**************************************************************************
- *   2007-2014 by Peter Semiletov                                          *
- *   [email protected]                                                           *
+ *   2007-2017 by Peter Semiletov                                          *
+ *   [email protected]                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *

diff --git a/logmemo.cpp b/logmemo.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2011 by Peter Semiletov                            *
+ *   2007-2017 by Peter Semiletov                                          *
  *   [email protected]                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -40,7 +40,7 @@ CLogMemo::CLogMemo ( QWidget * parent): QPlainTextEdit (parent)
   memo->setTextInteractionFlags (Qt::LinksAccessibleByMouse | Qt::TextSelectableByMouse | 
                                  Qt::TextSelectableByKeyboard);*/
 
-    setFocusPolicy (Qt::ClickFocus);
+  setFocusPolicy (Qt::ClickFocus);
   setUndoRedoEnabled (false);
   setReadOnly (true);
 

diff --git a/logmemo.h b/logmemo.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2010 by Peter Semiletov                            *
+ *   2007-2017 by Peter Semiletov                                          *
  *   [email protected]                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

diff --git a/main.cpp b/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyleft 2007-2017 by Peter Semiletov <[email protected]>                   *
+ *   Copyleft 2007-2017 by Peter Semiletov <[email protected]>     *
  *                                                                         *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,7 +25,10 @@
 #include "rvln.h"
 
 #include "single_application.h"
+
+#ifndef Q_OS_OS2
 #include "single_application_shared.h"
+#endif
 
 extern rvln *mainWindow; 
 
@@ -76,6 +79,7 @@ int main (int argc, char *argv[])
 
      return 0;
     }
+
 #endif     
 
   mainWindow = new rvln();
@@ -94,5 +98,4 @@ int main (int argc, char *argv[])
   mainWindow->show();
 
   return app.exec();   
-
 }
diff --git a/rvln.cpp b/rvln.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   2007-2017 by Peter Semiletov                            *
- *   [email protected]                                             *
+ *   2007-2017 by Peter Semiletov                                          *
+ *   [email protected]                                             *
 
 started at 08 November 2007
  *                                                                         *

diff --git a/single_application_shared.cpp b/single_application_shared.cpp
@@ -99,5 +99,4 @@ bool CSingleApplicationShared::sendMessage(const QString &message)
     return true;
 }
 
-
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,5 +99,4 @@ bool CSingleApplicationShared::sendMessage(const QString &message)
		return true;
		}


		#endif