Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2184 from defnax/ui-fix-6

Browse Source 
UI fixes
This commit is contained in:
defnax 2020-12-28 12:35:19 +01:00 committed by GitHub
commit b4cbf2691f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -696,7 +696,7 @@ void ChatLobbyDialog::participantsTreeWidgetDoubleClicked(QTreeWidgetItem *item,
if(column == COLUMN_NAME) if(column == COLUMN_NAME)
{ {
getChatWidget()->pasteText("@" + RsHtml::plainText(item->text(COLUMN_NAME))) ; getChatWidget()->pasteText("@" + RsHtml::plainText(item->text(COLUMN_NAME)) + " ") ;
return ; return ;
} }

12
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -1842,13 +1842,16 @@ void ChatWidget::updateTitle()
ui->titleLabel->setText(RsHtml::plainText(name) + "@" + RsHtml::plainText(title)); ui->titleLabel->setText(RsHtml::plainText(name) + "@" + RsHtml::plainText(title));
} }
void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const QString& /*status_string*/) void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QString& status_string)
{ {
if (chatType() != CHATTYPE_PRIVATE )
{
return;
}
QString status_text; QString status_text;
// TODO: fix peer_id and types and eveyrhing if (RsPeerId(peer_id.toStdString()) == chatId.toPeerId()) {
/*
if (RsPeerId(peer_id.toStdString()) == peerId) {
// the peers status string has changed // the peers status string has changed
if (status_string.isEmpty()) { if (status_string.isEmpty()) {
ui->statusMessageLabel->hide(); ui->statusMessageLabel->hide();
@ -1863,7 +1866,6 @@ void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const
ui->statusLabel->setAlignment ( Qt::AlignVCenter ); ui->statusLabel->setAlignment ( Qt::AlignVCenter );
} }
} }
*/
} }
void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent) void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent)

8
retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
View File

@ -12,16 +12,16 @@
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>1</number>
</property> </property>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">

2
retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
View File

@ -92,7 +92,7 @@ void ImHistoryBrowserCreateItemsThread::run()
/** Default constructor */ /** Default constructor */
ImHistoryBrowser::ImHistoryBrowser(const ChatId &chatId, QTextEdit *edit,const QString &chatTitle, QWidget *parent) ImHistoryBrowser::ImHistoryBrowser(const ChatId &chatId, QTextEdit *edit,const QString &chatTitle, QWidget *parent)
: QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint)
{ {
/* Invoke Qt Designer generated QObject setup routine */ /* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this); ui.setupUi(this);

4
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -1109,3 +1109,7 @@ PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame
border-radius: 6px; border-radius: 6px;
background: white; background: white;
} }
ChatLobbyWidget QTreeWidget#lobbyTreeWidget{
font-size: 10pt;
}

2
retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp
View File

@ -41,8 +41,6 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
ui.unit_CB->addItem(tr("KB/s")) ; ui.unit_CB->addItem(tr("KB/s")) ;
ui.unit_CB->addItem(tr("Count")) ; ui.unit_CB->addItem(tr("Count")) ;
ui.logScale_CB->setChecked(true) ;
ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_FRIEND,BWGraphSource::GRAPH_TYPE_SUM) ; ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_FRIEND,BWGraphSource::GRAPH_TYPE_SUM) ;
ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_SERVICE,BWGraphSource::GRAPH_TYPE_SUM) ; ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_SERVICE,BWGraphSource::GRAPH_TYPE_SUM) ;

2
retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp
View File

@ -192,7 +192,7 @@ BwCtrlWindow::BwCtrlWindow(QWidget *parent)
/* Set header resize modes and initial section sizes Peer TreeView*/ /* Set header resize modes and initial section sizes Peer TreeView*/
QHeaderView * _header = bwTreeWidget->header () ; QHeaderView * _header = bwTreeWidget->header () ;
// _header->resizeSection ( COLUMN_RSNAME, 170*fact ); // _header->resizeSection ( COLUMN_RSNAME, 170*fact );
QHeaderView_setSectionResizeMode(_header, QHeaderView::ResizeToContents); QHeaderView_setSectionResizeMode(_header, QHeaderView::Interactive);
} }
BwCtrlWindow::~BwCtrlWindow() BwCtrlWindow::~BwCtrlWindow()

2
retroshare-gui/src/gui/statistics/DhtWindow.cpp
View File

@ -109,7 +109,7 @@ void DhtWindow::updateDisplay()
RsAutoUpdatePage::unlockAllEvents() ; RsAutoUpdatePage::unlockAllEvents() ;
QHeaderView_setSectionResizeMode(ui.peerTreeWidget->header(), QHeaderView::ResizeToContents); //QHeaderView_setSectionResizeMode(ui.peerTreeWidget->header(), QHeaderView::ResizeToContents);
QHeaderView_setSectionResizeMode(ui.dhtTreeWidget->header(), QHeaderView::ResizeToContents); QHeaderView_setSectionResizeMode(ui.dhtTreeWidget->header(), QHeaderView::ResizeToContents);
QHeaderView_setSectionResizeMode(ui.relayTreeWidget->header(), QHeaderView::ResizeToContents); QHeaderView_setSectionResizeMode(ui.relayTreeWidget->header(), QHeaderView::ResizeToContents);
} }

2
retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
View File

@ -203,6 +203,8 @@ void GlobalRouterStatistics::updateContent()
item -> setData(COL_DUPLICATION_FACTOR, Qt::DisplayRole, QString::number(cache_infos[i].duplication_factor)); item -> setData(COL_DUPLICATION_FACTOR, Qt::DisplayRole, QString::number(cache_infos[i].duplication_factor));
item -> setData(COL_RECEIVEDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].routing_time)); item -> setData(COL_RECEIVEDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].routing_time));
item -> setData(COL_SENDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].last_sent_time)); item -> setData(COL_SENDTIME, Qt::DisplayRole, QString::number(now - cache_infos[i].last_sent_time));
item->setTextAlignment(COL_DATASIZE, Qt::AlignRight );
} }
} }

8
retroshare-gui/src/qss/qdarkstyle-v2.qss
View File

@ -2277,3 +2277,11 @@ PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame
MainWindow QListWidget { MainWindow QListWidget {
font-size: 12pt; font-size: 12pt;
} }
ChatLobbyWidget QTreeWidget#lobbyTreeWidget{
font-size: 10pt;
}
NewFriendList QTreeView#peerTreeWidget {
font-size: 12pt;
}

8
retroshare-gui/src/qss/qdarkstyle.qss
View File

@ -1498,3 +1498,11 @@ PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame
MainWindow QListWidget { MainWindow QListWidget {
font-size: 12pt; font-size: 12pt;
} }
ChatLobbyWidget QTreeWidget#lobbyTreeWidget{
font-size: 10pt;
}
NewFriendList QTreeView#peerTreeWidget {
font-size: 12pt;
}

2
retroshare-gui/src/util/misc.cpp
View File

@ -305,7 +305,7 @@ QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption,
{ {
// Let the user choose an picture file // Let the user choose an picture file
QString fileName; QString fileName;
if (!getOpenFileName(parent, RshareSettings::LASTDIR_IMAGES, caption, tr("Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)"), fileName)) if (!getOpenFileName(parent, RshareSettings::LASTDIR_IMAGES, caption, tr("Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)"), fileName))
return QPixmap(); return QPixmap();
if(width > 0 && height > 0) if(width > 0 && height > 0)