StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fixed css, comments, cleanup

Browse Source
This commit is contained in:
krepa098 2014-10-15 17:08:31 +02:00
parent e8416a98a2
commit c4529d4062
6 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/misc/style.cpp
View File

@ -83,13 +83,13 @@ QFont Style::getFont(Style::Font font)
static int defSize = QFontInfo(QFont()).pixelSize(); static int defSize = QFontInfo(QFont()).pixelSize();
static QFont fonts[] = { static QFont fonts[] = {
appFont(defSize + 2, QFont::Bold), appFont(defSize + 2, QFont::Bold), // extra big
appFont(defSize , QFont::Normal), appFont(defSize , QFont::Normal), // big
appFont(defSize , QFont::Bold), appFont(defSize , QFont::Bold), // big bold
appFont(defSize - 1, QFont::Normal), appFont(defSize - 1, QFont::Normal), // medium
appFont(defSize - 1, QFont::Bold), appFont(defSize - 1, QFont::Bold), // medium bold
appFont(defSize - 2, QFont::Normal), appFont(defSize - 2, QFont::Normal), // small
appFont(defSize - 2, QFont::Light), appFont(defSize - 2, QFont::Light), // small light
}; };
return fonts[font]; return fonts[font];

50
src/widget/form/settings/avsettings.ui
View File

@ -57,31 +57,6 @@
<string>Video Settings</string> <string>Video Settings</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0">
<item>
<widget class="QFrame" name="CamFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>1</horstretch>
<verstretch>99</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="VideoSurface" name="CamVideoSurface" native="true"/>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
@ -162,6 +137,31 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0">
<item>
<widget class="QFrame" name="CamFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>1</horstretch>
<verstretch>99</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="VideoSurface" name="CamVideoSurface" native="true"/>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

6
src/widget/netcamview.cpp
View File

@ -15,12 +15,8 @@
*/ */
#include "netcamview.h" #include "netcamview.h"
<<<<<<< HEAD:src/widget/netcamview.cpp
#include "src/core.h" #include "src/core.h"
======= #include "src/widget/videosurface.h"
#include "core.h"
#include "widget/videosurface.h"
>>>>>>> NetVideoSource, YUV shader, fixes:widget/netcamview.cpp
#include <QLabel> #include <QLabel>
#include <QHBoxLayout> #include <QHBoxLayout>

3
src/widget/videosurface.cpp
View File

@ -139,11 +139,8 @@ void VideoSurface::paintGL()
glBindTexture(GL_TEXTURE_2D, textureId); glBindTexture(GL_TEXTURE_2D, textureId);
glTexImage2D(GL_TEXTURE_2D,0, GL_RGB, res.width(), res.height(), 0, GL_RGB, GL_UNSIGNED_BYTE, 0); glTexImage2D(GL_TEXTURE_2D,0, GL_RGB, res.width(), res.height(), 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
updateGeometry();
} }
if (!currFrame.isNull()) if (!currFrame.isNull())
{ {
pboIndex = (pboIndex + 1) % 2; pboIndex = (pboIndex + 1) % 2;

20
ui/settings/mainContent.css
View File

@ -1,27 +1,25 @@
QWidget
{
color: black;
background-color: white;
font: @big;
}
QCheckBox QCheckBox
{ {
color: black; color: black;
} }
QLabel
{
color: black;
}
QGroupBox::title
{
color: black;
}
QGroupBox QGroupBox
{ {
background-color: white; background-color: white;
} }
QWidget QGroupBox
{ {
color: black; color: black;
background-color: white; background-color: white;
font: @bigBold;
} }
QComboBox QComboBox

1
ui/settings/mainHead.css
View File

@ -2,4 +2,5 @@ QWidget
{ {
color: black; color: black;
background: white; background: white;
font: @bigBold;
} }