diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 10439cf7a..b490776fd 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -156,6 +156,38 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name, updateAvatar() ; updatePeerAvatar(id) ; + + // load settings + processSettings(true); +} + +/** Destructor. */ +PopupChatDialog::~PopupChatDialog() +{ + // save settings + processSettings(false); + + +} + +void PopupChatDialog::processSettings(bool bLoad) +{ + + Settings->beginGroup(QString("ChatDialog")); + + if (bLoad) { + // load settings + + // state of splitter + ui.chatsplitter->restoreState(Settings->value("ChatSplitter").toByteArray()); + } else { + // save settings + + // state of splitter + Settings->setValue("ChatSplitter", ui.chatsplitter->saveState()); + } + + Settings->endGroup(); } /*static*/ PopupChatDialog *PopupChatDialog::getPrivateChat(std::string id, std::string name, uint chatflags) @@ -338,12 +370,6 @@ void PopupChatDialog::updateStatusString(const QString& status_string) QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ; } - -/** Destructor. */ -PopupChatDialog::~PopupChatDialog() -{ -} - /** Overloads the default show() slot so we can set opacity*/ @@ -834,7 +860,7 @@ void PopupChatDialog::updatePeerAvatar(const std::string& peer_id) #ifdef CHAT_DEBUG std::cerr << "Got no image" << std::endl ; #endif - ui.avatarlabel->setPixmap(QPixmap(":/images/no_avatar.png")); + ui.avatarlabel->setPixmap(QPixmap(":/images/no_avatar_70.png")); return ; } diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index 9797649a1..53f86706d 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -112,6 +112,7 @@ private: void colorChanged(const QColor &c); void addAttachment(std::string,int flag); + void processSettings(bool bLoad); QAction *actionTextBold; QAction *actionTextUnderline; diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index 0974e31c6..952aacd76 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -6,8 +6,8 @@ 0 0 - 484 - 439 + 542 + 418 @@ -17,7 +17,7 @@ QToolBar#toolBar{background-image: url(:/images/connect/connectFriendBanner.png)} - + 0 @@ -28,41 +28,427 @@ 0 - - - - 0 - 0 - + + + Qt::Vertical - - - 0 - 0 - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> - - - true - - - false - + + + true + + + false + + + + + + 0 + + + + + + 16 + 46 + + + + + 16777215 + 46 + + + + QFrame#Chatbuttonframe{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 6 + + + + + Qt::Horizontal + + + + 190 + 25 + + + + + + + + + 0 + 0 + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + false + + + + 28 + 28 + + + + + 28 + 28 + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set Chat Window Style</p></body></html> + + + + + + + 24 + 24 + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Bold + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Underline + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Italic + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Set Font + + + + + + + ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup + + + false + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Text Color + + + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + QPushButton::menu-indicator { +subcontrol-origin: padding; +subcontrol-position: bottom right; +} + +QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { +position: relative; +top: 1px; left: 1px; /* shift the arrow by 2 px */ +} + +QPushButton:hover { +border: 1px solid #CCCCCC; +} + + + + + + + :/images/configure.png:/images/configure.png + + + + 22 + 22 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Attach a Picture + + + + + + + :/images/add_image24.png:/images/add_image24.png + + + + 24 + 24 + + + + true + + + + + + + + 28 + 28 + + + + Add a File for your Friend + + + + + + + :/images/add-share24.png:/images/add-share24.png + + + + 24 + 24 + + + + true + + + + + + + + + + + 0 + 0 + + + + + + - + QFrame::StyledPanel @@ -171,7 +557,7 @@ border-image: url(:/images/mystatus_bg.png); - + @@ -217,374 +603,6 @@ border-image: url(:/images/mystatus_bg.png); - - - - 16 - 46 - - - - QFrame#Chatbuttonframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 9 - - - 6 - - - - - Qt::Horizontal - - - - 190 - 25 - - - - - - - - - 0 - 0 - - - - - 28 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - - - - - false - - - - 28 - 28 - - - - - 28 - 28 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set Chat Window Style</p></body></html> - - - - - - - 24 - 24 - - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Bold - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Underline - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Italic - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Set Font - - - - - - - ../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup../../../../../../../Dokumente und Einstellungen/Linux/.designer/backup - - - false - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Text Color - - - - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - QPushButton::menu-indicator { -subcontrol-origin: padding; -subcontrol-position: bottom right; -} - -QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { -position: relative; -top: 1px; left: 1px; /* shift the arrow by 2 px */ -} - -QPushButton:hover { -border: 1px solid #CCCCCC; -} - - - - - - - :/images/configure.png:/images/configure.png - - - - 22 - 22 - - - - true - - - - - - - - 28 - 28 - - - - - 28 - 28 - - - - Attach a Picture - - - - - - - :/images/add_image24.png:/images/add_image24.png - - - - 24 - 24 - - - - true - - - - - - - - 28 - 28 - - - - Add a File for your Friend - - - - - - - :/images/add-share24.png:/images/add-share24.png - - - - 24 - 24 - - - - true - - - - - - - - - - - 0 - 0 - - - - - 0 @@ -617,7 +635,7 @@ border: 1px solid #CCCCCC; - +