Skip to content

Commit

Permalink
Upgrade to v1.6.2. Default to Search tab instead of last used.
Browse files Browse the repository at this point in the history
  • Loading branch information
xsacha committed Sep 7, 2014
1 parent 214aafe commit e167f5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Sachesi.pro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TARGET="Sachesi"
win32: RC_ICONS += assets/sachesi-114.ico
else:mac: ICON = assets/sachesi-114.icns
else: ICON = assets/sachesi-114.png
VERSION = 1.6.1
VERSION = 1.6.2

# Global specific
CONFIG += c++11
Expand All @@ -30,8 +30,8 @@ win32 {

!mingw {
DEFINES += NOMINMAX _CRT_SECURE_NO_WARNINGS
static: LIBS += -L$$OPENSSL_PATH\\lib\\VC\\static -llibeay32MT -lssleay32MT -lGDI32 -lAdvapi32
else: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32
static: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32MT -lssleay32MT -lGDI32 -lAdvapi32
else: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32MT -lGDI32
# Hardcoded lib folder for winsocks
LIBS+= -L"C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x86" -lWSock32 -lUser32 -lCrypt32
}
Expand Down
5 changes: 3 additions & 2 deletions qml/generic/Title.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "UI" 1.0
ApplicationWindow {
id: window
// TODO: Send version from C++
title: "Sachesi 1.6.1"
title: "Sachesi 1.6.2"
width: 520
height: 480
minimumHeight: 520
Expand All @@ -19,7 +19,6 @@ ApplicationWindow {
property alias y: window.y
property alias width: window.width
property alias height: window.height
property alias tab: titleRow.currentIndex
property url installFolder
property url backupFolder
}
Expand Down Expand Up @@ -70,6 +69,8 @@ ApplicationWindow {
title: "Install";
Installer { anchors.fill: parent }
}
// HACK: Reset tab with timer otherwise it has no tab on Windows
Timer { running: true; onTriggered: titleRow.currentIndex = 1 + p.hasBootAccess }
Component.onCompleted: {
if (p.hasBootAccess)
titleRow.addTab("Boot", Qt.createComponent("Boot.qml") )
Expand Down

0 comments on commit e167f5b

Please sign in to comment.