# HG changeset patch # User Teemu Piippo # Date 1378668596 -10800 # Node ID dd382c61b16fdd4fc899b05ae9fc2e43329034d6 # Parent 6b82f6a3ad53f42d45052ff7331161506274f116 further renaming/restructuring diff -r 6b82f6a3ad53 -r dd382c61b16f .gitignore --- a/.gitignore Sun Sep 08 22:08:52 2013 +0300 +++ b/.gitignore Sun Sep 08 22:29:56 2013 +0300 @@ -1,8 +1,8 @@ Makefile -zandemo.kdev4 +zcinema.kdev4 *.o ui_*.h -zandemo +zcinema *.cld build *.bak diff -r 6b82f6a3ad53 -r dd382c61b16f icons/zandemo.ico Binary file icons/zandemo.ico has changed diff -r 6b82f6a3ad53 -r dd382c61b16f icons/zcinema.ico Binary file icons/zcinema.ico has changed diff -r 6b82f6a3ad53 -r dd382c61b16f src/src.pro --- a/src/src.pro Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -CONFIG += qt debug -TARGET = ../zcinema -DEPENDPATH += . -INCLUDEPATH += . -RC_FILE = ../zcinema.rc -RESOURCES = ../zcinema.qrc -RCC_DIR = ./build/ -OBJECTS_DIR = ./build/ -MOC_DIR = ./build/ -RCC_DIR = ./build/ -SOURCES = *.cpp -HEADERS = *.h -FORMS = ui/*.ui -QMAKE_CXXFLAGS += -std=c++0x - -# The widgets are separated into a different module in Qt5, so we need to add -# it here. Doing so under Qt4 just results in a warning, though. -greaterThan (QT_MAJOR_VERSION, 4): QT += widgets \ No newline at end of file diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/addversion.ui --- a/src/ui/addversion.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ - - - AddVersion - - - - 0 - 0 - 400 - 149 - - - - Add Zandronum Version - - - - - - Add a Zandronum Version - - - - - - - - - Name: - - - - - - - - - - Path to Binary: - - - - - - - - - - - - ... - - - - - - - - - Release - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - AddVersion - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AddVersion - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/configbox.ui --- a/src/ui/configbox.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,297 +0,0 @@ - - - ConfigBox - - - - 0 - 0 - 544 - 308 - - - - - 320 - 256 - - - - Dialog - - - - :/icons/zandemo.ico:/icons/zandemo.ico - - - - - - 0 - - - - WAD Paths - - - - - - - - QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - true - - - QAbstractItemView::DragDrop - - - Qt::MoveAction - - - QAbstractItemView::ExtendedSelection - - - QListView::SinglePass - - - true - - - - - - - - - Delete - - - - - - - Clear - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - ... - - - - - - - - - Add - - - - - - - - - - Release Binaries - - - - - - QFrame::NoFrame - - - true - - - - - 0 - 0 - 516 - 225 - - - - - - - - - - - - Edit Versions - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Testing Binaries - - - - - - QFrame::NoFrame - - - true - - - - - 0 - 0 - 516 - 225 - - - - - - - - - - - - Edit Versions - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Misc - - - - - - If this is not set, a prompt showing demo info is displayed first. - - - Launch without prompt - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - wad_clear - clicked(bool) - wad_pathsList - clear() - - - 463 - 129 - - - 219 - 189 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/demoprompt.ui --- a/src/ui/demoprompt.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,188 +0,0 @@ - - - DemoPrompt - - - - 0 - 0 - 319 - 164 - - - - Dialog - - - - :/icons/zandemo.ico:/icons/zandemo.ico - - - - - - - 11 - 75 - false - true - - - - [[ DEMO NAME ]] - - - Qt::AlignCenter - - - - - - - - - Zandronum Version: - - - - - - - Recorder: - - - - - - - - 75 - true - - - - [[ VERSION ]] - - - - - - - - 75 - true - - - - [[ RECORDER ]] - - - - - - - IWAD: - - - - - - - - 75 - true - - - - [[ IWAD ]] - - - - - - - PWADs: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 75 - true - - - - [[ PWADS ]] - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - buttonBox - accepted() - DemoPrompt - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - DemoPrompt - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/findfile.ui --- a/src/ui/findfile.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ - - - FindFile - - - - 0 - 0 - 326 - 90 - - - - Dialog - - - - :/icons/zandemo.ico:/icons/zandemo.ico - - - - - - Please select a demo file to play back. - - - - - - - - - - - - ... - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - buttonBox - accepted() - FindFile - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - FindFile - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/unknownversion.ui --- a/src/ui/unknownversion.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ - - - UnknownVersion - - - - 0 - 0 - 400 - 246 - - - - Unknown Zandronum Version - - - - :/icons/zandemo.ico:/icons/zandemo.ico - - - - - - The demo <DEMO> has been recorded with unknown version <VERSION>. You can add this to the list of known Zandronum versions and specify a binary for it here. - - - true - - - - - - - Qt::Horizontal - - - - - - - - - Zandronum binary path: - - - - - - - - - - - - ... - - - - - - - - - - - Qt::Horizontal - - - - - - - Add Zandronum version and launch the demo - - - - - - - Cancel and exit - - - - - - - - - - - - - - m_cancel - clicked() - UnknownVersion - reject() - - - 118 - 210 - - - 394 - 73 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f src/ui/versionEditor.ui --- a/src/ui/versionEditor.ui Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,159 +0,0 @@ - - - VersionEditor - - - - 0 - 0 - 577 - 450 - - - - Edit Zandronum Versions - - - - :/icons/zandemo.ico:/icons/zandemo.ico - - - - - - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - true - - - true - - - false - - - - Version - - - - - Release - - - - - Binary Path - - - - - - - - - - Add... - - - - - - - false - - - Edit... - - - - - - - false - - - Remove - - - - - - - Clear - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - m_buttonBox - accepted() - VersionEditor - accept() - - - 248 - 254 - - - 157 - 274 - - - - - m_buttonBox - rejected() - VersionEditor - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff -r 6b82f6a3ad53 -r dd382c61b16f ui/addversion.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/addversion.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,113 @@ + + + AddVersion + + + + 0 + 0 + 400 + 149 + + + + Add Zandronum Version + + + + + + Add a Zandronum Version + + + + + + + + + Name: + + + + + + + + + + Path to Binary: + + + + + + + + + + + + ... + + + + + + + + + Release + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + AddVersion + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AddVersion + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f ui/configbox.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/configbox.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,297 @@ + + + ConfigBox + + + + 0 + 0 + 544 + 308 + + + + + 320 + 256 + + + + Dialog + + + + :/icons/zcinema.ico:/icons/zcinema.ico + + + + + + 0 + + + + WAD Paths + + + + + + + + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + true + + + QAbstractItemView::DragDrop + + + Qt::MoveAction + + + QAbstractItemView::ExtendedSelection + + + QListView::SinglePass + + + true + + + + + + + + + Delete + + + + + + + Clear + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + ... + + + + + + + + + Add + + + + + + + + + + Release Binaries + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 516 + 225 + + + + + + + + + + + + Edit Versions + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Testing Binaries + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 516 + 225 + + + + + + + + + + + + Edit Versions + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Misc + + + + + + If this is not set, a prompt showing demo info is displayed first. + + + Launch without prompt + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + wad_clear + clicked(bool) + wad_pathsList + clear() + + + 463 + 129 + + + 219 + 189 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f ui/demoprompt.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/demoprompt.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,188 @@ + + + DemoPrompt + + + + 0 + 0 + 319 + 164 + + + + Dialog + + + + :/icons/zcinema.ico:/icons/zcinema.ico + + + + + + + 11 + 75 + false + true + + + + [[ DEMO NAME ]] + + + Qt::AlignCenter + + + + + + + + + Zandronum Version: + + + + + + + Recorder: + + + + + + + + 75 + true + + + + [[ VERSION ]] + + + + + + + + 75 + true + + + + [[ RECORDER ]] + + + + + + + IWAD: + + + + + + + + 75 + true + + + + [[ IWAD ]] + + + + + + + PWADs: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 75 + true + + + + [[ PWADS ]] + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + DemoPrompt + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DemoPrompt + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f ui/findfile.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/findfile.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,91 @@ + + + FindFile + + + + 0 + 0 + 326 + 90 + + + + Dialog + + + + :/icons/zcinema.ico:/icons/zcinema.ico + + + + + + Please select a demo file to play back. + + + + + + + + + + + + ... + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + FindFile + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + FindFile + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f ui/unknownversion.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/unknownversion.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,110 @@ + + + UnknownVersion + + + + 0 + 0 + 400 + 246 + + + + Unknown Zandronum Version + + + + :/icons/zcinema.ico:/icons/zcinema.ico + + + + + + The demo <DEMO> has been recorded with unknown version <VERSION>. You can add this to the list of known Zandronum versions and specify a binary for it here. + + + true + + + + + + + Qt::Horizontal + + + + + + + + + Zandronum binary path: + + + + + + + + + + + + ... + + + + + + + + + + + Qt::Horizontal + + + + + + + Add Zandronum version and launch the demo + + + + + + + Cancel and exit + + + + + + + + + + + + + + m_cancel + clicked() + UnknownVersion + reject() + + + 118 + 210 + + + 394 + 73 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f ui/versionEditor.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/versionEditor.ui Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,159 @@ + + + VersionEditor + + + + 0 + 0 + 577 + 450 + + + + Edit Zandronum Versions + + + + :/icons/zcinema.ico:/icons/zcinema.ico + + + + + + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + true + + + true + + + false + + + + Version + + + + + Release + + + + + Binary Path + + + + + + + + + + Add... + + + + + + + false + + + Edit... + + + + + + + false + + + Remove + + + + + + + Clear + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + m_buttonBox + accepted() + VersionEditor + accept() + + + 248 + 254 + + + 157 + 274 + + + + + m_buttonBox + rejected() + VersionEditor + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -r 6b82f6a3ad53 -r dd382c61b16f zandemo.pro --- a/zandemo.pro Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) ti hein�kuuta 16 23:34:02 2013 -###################################################################### - -TEMPLATE = subdirs -TARGET = zandemo -SUBDIRS += src diff -r 6b82f6a3ad53 -r dd382c61b16f zandemo.rc --- a/zandemo.rc Sun Sep 08 22:08:52 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "icons/zandemo.ico" \ No newline at end of file diff -r 6b82f6a3ad53 -r dd382c61b16f zcinema.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/zcinema.pro Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,24 @@ +###################################################################### +# Automatically generated by qmake (2.01a) ti hein�kuuta 16 23:34:02 2013 +###################################################################### + +TEMPLATE = app +CONFIG += qt debug +TARGET = ./zcinema +DEPENDPATH += ./ ./ui +INCLUDEPATH += ./ +RC_FILE = ./zcinema.rc +RESOURCES = ./zcinema.qrc +RCC_DIR = ./build/ +OBJECTS_DIR = ./build/ +MOC_DIR = ./build/ +RCC_DIR = ./build/ +UI_DIR = ./build/ +SOURCES = ./src/*.cpp +HEADERS = ./src/*.h +FORMS = ./ui/*.ui +QMAKE_CXXFLAGS += -std=c++0x + +# The widgets are separated into a different module in Qt5, so we need to add +# it here. Doing so under Qt4 just results in a warning, though. +greaterThan (QT_MAJOR_VERSION, 4): QT += widgets \ No newline at end of file diff -r 6b82f6a3ad53 -r dd382c61b16f zcinema.qrc --- a/zcinema.qrc Sun Sep 08 22:08:52 2013 +0300 +++ b/zcinema.qrc Sun Sep 08 22:29:56 2013 +0300 @@ -1,7 +1,7 @@ - ./icons/zandemo.ico + ./icons/zcinema.ico LICENSE diff -r 6b82f6a3ad53 -r dd382c61b16f zcinema.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/zcinema.rc Sun Sep 08 22:29:56 2013 +0300 @@ -0,0 +1,1 @@ +IDI_ICON1 ICON DISCARDABLE "icons/zandemo.ico" \ No newline at end of file