Bug fix (when closing the widgetpdfwrapper) + 0.8.1 release on mac

Bramas · Nov 28, 2013 · b10d9f3 · b10d9f3
1 parent 0b8fc37
commit b10d9f3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/VERSION_MAC b/VERSION_MAC
@@ -1 +1 @@
-0.8.0
+0.8.1
diff --git a/source/configmanager.cpp b/source/configmanager.cpp
@@ -777,6 +777,7 @@ void ConfigManager::checkRevision()
         }
     }
     case 0x000800:
+    case 0x000801:
 
         break;
     }

diff --git a/source/filemanager.cpp b/source/filemanager.cpp
@@ -375,9 +375,12 @@ void FileManager::setPdfViewerInItsOwnWidget(bool ownWidget)
         {
             widgetFile->addWidgetPdfViewerToSplitter();
         }
-        _widgetPdfViewerWrapper->close();
-        _widgetPdfViewerWrapper->deleteLater();
-        _widgetPdfViewerWrapper = 0;
+        if(_widgetPdfViewerWrapper)
+        {
+            _widgetPdfViewerWrapper->close();
+            _widgetPdfViewerWrapper->deleteLater();
+            _widgetPdfViewerWrapper = 0;
+        }
     }
 }
 void FileManager::ensurePdfViewerIsVisible()

diff --git a/source/icons.qrc b/source/icons.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>data/icons/appicon.png</file>
-        <file>data/cursor/whiteBeam.tiff</file>
         <file>data/img/incorporatedPdf.png</file>
         <file>data/img/incorporatedPdfHover.png</file>
         <file>data/img/separatedPdf.png</file>
@@ -10,5 +9,6 @@
         <file>data/img/unlinkSync.png</file>
         <file>data/img/splitbutton_closetop.png</file>
         <file>data/img/splitbutton_horizontal.png</file>
+        <file>data/cursor/whiteBeam.png</file>
     </qresource>
 </RCC>
diff --git a/source/texiteasy.pro b/source/texiteasy.pro
@@ -13,8 +13,8 @@ TEMPLATE = app
 
 APPLICATION_NAME = \\\"'TexitEasy'\\\"
 TEXITEASY_UPDATE_WEBSITE = \\\"'http://texiteasy.com'\\\"
-VERSION = \\\"'0.8.0'\\\"
-VERSION_HEX = 0x000800
+VERSION = \\\"'0.8.1'\\\"
+VERSION_HEX = 0x000801
 
 #DEFINES += LIB_DEPLOY
 

diff --git a/source/widgettextedit.cpp b/source/widgettextedit.cpp
@@ -1467,7 +1467,7 @@ void WidgetTextEdit::initTheme()
 #ifdef OS_MAC
     if(ConfigManager::Instance.getTextCharFormats("normal").background().color().value()<100) // if it's a dark color
     {
-        QPixmap whiteBeamPixmap("/Users/quentinbramas/Projects/texiteasy/texiteasy-repository/source/data/cursor/whiteBeam.png");
+        QPixmap whiteBeamPixmap(":/data/cursor/whiteBeam.png");
         QCursor whiteBeam(whiteBeamPixmap);
         this->viewport()->setCursor(whiteBeam);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -777,6 +777,7 @@ void ConfigManager::checkRevision() @@
             }
         }
         case 0x000800:
+        case 0x000801:
             break;
         }
@@ Expand Down @@