Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-17 05:22:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved font size definitions from ui files to default qss.

Browse source 
Added new base class StyledLabel to emulate the missing font-size by factor in qss.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-06 22:09:44 +00:00
parent 4cbc6c1cdb
commit 90c3c24412
42 changed files with 379 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/common/FriendList.ui
View file

@ -90,13 +90,6 @@
</item>
<item>
<widget class="QTreeWidget" name="peerTreeWidget">
<property name="font">
<font>
<pointsize>9</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
<kerning>true</kerning>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

1
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View file

@ -275,7 +275,6 @@ QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIc
QTreeWidgetItem *item = new QTreeWidgetItem();
font = item->font(COLUMN_NAME);
font.setBold(true);
font.setPointSize(10);
item->setText(COLUMN_NAME, name);
item->setData(COLUMN_DATA, ROLE_NAME, name);
item->setFont(COLUMN_NAME, font);

5
retroshare-gui/src/gui/common/GroupTreeWidget.ui
View file

@ -78,11 +78,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

38
retroshare-gui/src/gui/common/StyledLabel.cpp Normal file
View file

@ -0,0 +1,38 @@
/****************************************************************
* This file is distributed under the following license:
*
* Copyright (c) 2014, RetroShare Team
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QFont>
#include "StyledLabel.h"
/** Constructor */
StyledLabel::StyledLabel(QWidget *parent)
: QLabel(parent)
{
}
void StyledLabel::setFontSizeFactor(int factor)
{
QFont f = font();
qreal fontSize = factor * f.pointSizeF() / 100;
f.setPointSizeF(fontSize);
setFont(f);
}

39
retroshare-gui/src/gui/common/StyledLabel.h Normal file
View file

@ -0,0 +1,39 @@
/****************************************************************
* This file is distributed under the following license:
*
* Copyright (c) 2014, RetroShare Team
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifndef _STYLEDLABEL_H
#define _STYLEDLABEL_H
#include <QLabel>
#include <retroshare/rsidentity.h>
class StyledLabel : public QLabel
{
Q_OBJECT
Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor)
public:
StyledLabel(QWidget *parent = NULL);
void setFontSizeFactor(int factor);
};
#endif