Changeset 502:4c67de476ea3 in qutecom-2.2

Timestamp:

Feb 23, 2010 12:39:31 AM (3 years ago)

Author:

laurent@…

Branch:

default

Message:

bug fix : chat theme on windows

Location:

wengophone/src/presentation/qt

Files:

• QtBrowserWidget.cpp (modified) (1 diff)
• QtToolBar.cpp (modified) (1 diff)
• chat/QtChatHistoryWidget.cpp (modified) (6 diffs)
• chat/QtChatHistoryWidget.h (modified) (2 diffs)
• chat/QtChatTheme.cpp (modified) (1 diff)

wengophone/src/presentation/qt/QtBrowserWidget.cpp

@@ -167 +167 @@
                 //}
         }*/
-        else if(surl.contains(ANCHOR_SECRET_PERMANENT))
-        {
-                openwengo_secret_permanent_signal();
-        }
-        else if(surl.contains(ANCHOR_SFR_FR))
-        {
-                QDesktopServices::openUrl(QUrl("http://www.sfr.fr"));
-        }
-        else if(surl.contains(ANCHOR_MON_COMPTE))
-        {
-                QDesktopServices::openUrl(QUrl("http://www.sfr.fr/acces/index.jsp"));
-        }
-        else if(surl.contains(ANCHOR_REPONDEUR))
-        {
-                QDesktopServices::openUrl(QUrl("https://moncompte-neufbox.sfr.fr/moncompte-webapp/moncompte/servicesWeb/consulterMessagerie.action"));
-        }
 }

wengophone/src/presentation/qt/QtToolBar.cpp

@@ -607 +607 @@
 #if defined(OS_MACOSX)
         EnumToolBarMode::ToolBarMode toolBarMode = EnumToolBarMode::ToolBarModeIconsOnly;
-#elif   
+#else   
         Config & config = ConfigManager::getInstance().getCurrentConfig();
         std::string text = config.getToolBarMode();

wengophone/src/presentation/qt/chat/QtChatHistoryWidget.cpp

@@ -73 +73 @@
         QUrl url_css("data:text/css;charset=utf-8;base64,"+file.readAll().toBase64());
         page()->settings()->setUserStyleSheetUrl(url_css);
-        //QString css = _theme->getStyleSheet();
-        //document()->setDefaultStyleSheet(css);
-        
-        //QFile file_css(list_base.at(i)+"main.css");
-        //file_css.open(QIODevice::ReadOnly);
-        //QUrl url_css("data:text/css;charset=utf-8;base64,"+css.toLatin1().toBase64());
-        //page()->settings()->setUserStyleSheetUrl(url_css);
 }
 
@@ -163 +156 @@
         else
                 _data += html;
-        
-        setHtml(_data,QUrl("file://"+_theme->getCurrentThemePath()));
-        //scrollToBottom();
+
+        updateHtml();
 }
 
@@ -182 +174 @@
         
         _data += html;
-        setHtml(_data,QUrl("file://"+_theme->getCurrentThemePath()));
-        //ensureCursorVisible();
+
+        updateHtml();   
 }
 
@@ -190 +182 @@
 }
 
-QVariant QtChatHistoryWidget::loadResource(int type, const QUrl& url) {
-        /*if (type != QTextDocument::ImageResource || url.scheme() != "avatar") {
+/*QVariant QtChatHistoryWidget::loadResource(int type, const QUrl& url) {
+        if (type != QTextDocument::ImageResource || url.scheme() != "avatar") {
                 return QTextBrowser::loadResource(type, url);
         }
@@ -218 +210 @@
         }
 
-        return QVariant(pixmap);*/
-}
+        return QVariant(pixmap);
+}*/
 
 void QtChatHistoryWidget::scrollToBottom() {
@@ -239 +231 @@
         scrollToBottom();
 }
+
+void QtChatHistoryWidget::updateHtml()
+{
+#if defined(OS_WINDOWS)
+        setHtml(_data,QUrl(_theme->getCurrentThemePath()));
+#else
+        setHtml(_data,QUrl("file://"+_theme->getCurrentThemePath()));
+#endif
+}

wengophone/src/presentation/qt/chat/QtChatHistoryWidget.h

@@ -63 +63 @@
          * Overloaded to implement avatar loading
          */
-        virtual QVariant loadResource(int type, const QUrl& url);
+        //virtual QVariant loadResource(int type, const QUrl& url);
 
         void setAvatarPixmap(const QString& name, const QPixmap& pixmap);
@@ -81 +81 @@
         
 private:
+        void updateHtml();
+
         QString _data;
         

wengophone/src/presentation/qt/chat/QtChatTheme.cpp

@@ -71 +71 @@
         if (baseDir.isEmpty()) {
                 Config & config = ConfigManager::getInstance().getCurrentConfig();
-                baseDir = QString::fromUtf8(config.getResourcesDir().c_str())
-                        + "/chat/";
+                baseDir = QString::fromUtf8(config.getResourcesDir().c_str());
+
+#if defined(OS_WINDOWS)
+                baseDir = baseDir.replace("\\","/");
+#endif
+                baseDir += "/chat/";
         }
         return baseDir;