Skip to content

BugFixes #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 18, 2015
Merged

BugFixes #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78a4be5
Fix a Bug where it doesn't saved the latest mainWIdow size
BurrrY Oct 18, 2015
689cd85
Change the Style of Dialogs
BurrrY Oct 18, 2015
88037b2
Merge branch 'master' of https://github.com/FusionLauncher/FusionClient
BurrrY Oct 18, 2015
f49e2be
Fix the Textcolor in mainwindow
BurrrY Oct 18, 2015
90e2ba6
Merge branch 'master' of github.com:BurrrY/FusionClient
BurrrY Oct 18, 2015
03cd371
Remove Typo from field
BurrrY Oct 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsettingsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
<widget class="QWidget" name="widget_3" native="true">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="cb_int_laguage"/>
<widget class="QComboBox" name="cb_int_language"/>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="pb_selectStylesheet">
Expand Down
17 changes: 8 additions & 9 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,11 @@ void MainWindow::prepareResize(QMouseEvent *event) {

void MainWindow::mouseReleaseEvent(QMouseEvent *event)
{
if(resizeHeightEnabled||resizeWidthEnabled||resizeWidthEnabledInv) {
resizeTimer.start(1000);
qDebug() << "Start Tiemr";
}

dragEnabled = false;
resizeHeightEnabled = false;
resizeWidthEnabled = false;
Expand All @@ -607,15 +612,9 @@ void MainWindow::mouseDoubleClickEvent(QMouseEvent *event)

void MainWindow::resizeDone()
{
/*
if(currentView==0){
db.updateIntPref("minviewWidth", this->width());
db.updateIntPref("minviewHeight", this->height());
} else */
{
db.updateIntPref("defaultviewWidth", this->width());
db.updateIntPref("defaultviewHeight", this->height());
}

db.updateIntPref("defaultviewWidth", this->width());
db.updateIntPref("defaultviewHeight", this->height());
}

void MainWindow::mouseMoveEvent(QMouseEvent *event)
Expand Down
13 changes: 12 additions & 1 deletion stylesheet.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@ background-color: #3fc1f4;
background:#1DAEE1;
}

#MainWindow {
#MainWindow, QDialog {
background:#1DAEE1;
}

QPushButton {
background:#dadada;
border: 1px solid #eee;
padding: 3px 13px;
}

FGameWidget #fgwDialog_GameTitle{
font-size:14pt;
Expand All @@ -76,6 +81,10 @@ FGameWidget #fgwDialog_Background[gameSelected="true"] {
color: #2DAAE1;
}

#w_mainInfo {
color: #2DAAE1;
}


#gameScrollArea, #scrollAreaWidgetContents, #gameListWidget {
background: transparent;
Expand Down Expand Up @@ -130,6 +139,8 @@ QScrollBar::down-button:vertical, #gameScrollArea::up-button:vertical{

#w_globalButtons QPushButton{
border-radius: 28px;
border: 0px solid #eee;
padding: 0;
width:56px;
height:56px;
background: #1DAAE1;
Expand Down