mirror of
https://github.com/debauchee/barrier.git
synced 2024-11-23 20:12:39 +03:00
Revert "added plugin manager gui #4168"
This reverts commit bfa9bab78d
.
This commit is contained in:
parent
c34928b7c8
commit
db1a611171
@ -213,8 +213,7 @@ class InternalCommands:
|
||||
defaultTarget = 'release'
|
||||
|
||||
cmake_dir = 'res'
|
||||
main_gui_dir = 'src/gui/main'
|
||||
plugin_gui_dir = 'src/gui/plugin'
|
||||
gui_dir = 'src/gui'
|
||||
doc_dir = 'doc'
|
||||
extDir = 'ext'
|
||||
|
||||
@ -540,21 +539,13 @@ class InternalCommands:
|
||||
print "QMake command: " + qmake_cmd_string
|
||||
|
||||
# run qmake from the gui dir
|
||||
self.try_chdir(self.main_gui_dir)
|
||||
self.try_chdir(self.gui_dir)
|
||||
err = os.system(qmake_cmd_string)
|
||||
self.restore_chdir()
|
||||
|
||||
if err != 0:
|
||||
raise Exception('QMake encountered error: ' + str(err))
|
||||
|
||||
# run qmake from the gui dir
|
||||
self.try_chdir(self.plugin_gui_dir)
|
||||
err = os.system(qmake_cmd_string)
|
||||
self.restore_chdir()
|
||||
|
||||
if err != 0:
|
||||
raise Exception('QMake encountered error: ' + str(err))
|
||||
|
||||
def getQmakeVersion(self):
|
||||
version = commands.getoutput("qmake --version")
|
||||
result = re.search('(\d+)\.(\d+)\.(\d)', version)
|
||||
@ -786,21 +777,14 @@ class InternalCommands:
|
||||
|
||||
if sys.platform == 'win32':
|
||||
for target in targets:
|
||||
self.try_chdir(self.main_gui_dir)
|
||||
self.try_chdir(self.gui_dir)
|
||||
err = os.system(gui_make_cmd + ' ' + target)
|
||||
self.restore_chdir()
|
||||
|
||||
if err != 0:
|
||||
raise Exception(gui_make_cmd + ' failed with error: ' + str(err))
|
||||
|
||||
self.try_chdir(self.plugin_gui_dir)
|
||||
err = os.system(gui_make_cmd + ' ' + target)
|
||||
self.restore_chdir()
|
||||
|
||||
|
||||
if err != 0:
|
||||
raise Exception(gui_make_cmd + ' failed with error: ' + str(err))
|
||||
else:
|
||||
self.try_chdir(self.main_gui_dir)
|
||||
self.try_chdir(self.gui_dir)
|
||||
err = os.system(gui_make_cmd)
|
||||
self.restore_chdir()
|
||||
|
||||
@ -813,13 +797,6 @@ class InternalCommands:
|
||||
|
||||
self.fixQtFrameworksLayout()
|
||||
|
||||
self.try_chdir(self.plugin_gui_dir)
|
||||
err = os.system(gui_make_cmd)
|
||||
self.restore_chdir()
|
||||
|
||||
if err != 0:
|
||||
raise Exception(gui_make_cmd + ' failed with error: ' + str(err))
|
||||
|
||||
def symlink(self, source, target):
|
||||
if not os.path.exists(target):
|
||||
os.symlink(source, target)
|
||||
|
@ -1,24 +0,0 @@
|
||||
TARGET = plugindownloader
|
||||
TEMPLATE = app
|
||||
SOURCES += src/main.cpp \
|
||||
src/MainWindow.cpp \
|
||||
src/Authenticate.cpp
|
||||
HEADERS += src/MainWindow.h \
|
||||
src/Arguments.h \
|
||||
src/Authenticate.h
|
||||
FORMS += res/MainWindowBase.ui
|
||||
win32 {
|
||||
Debug:DESTDIR = ../../../bin/Debug
|
||||
Release:DESTDIR = ../../../bin/Release
|
||||
}
|
||||
else:DESTDIR = ../../../bin
|
||||
debug {
|
||||
OBJECTS_DIR = tmp/debug
|
||||
MOC_DIR = tmp/debug
|
||||
RCC_DIR = tmp/debug
|
||||
}
|
||||
release {
|
||||
OBJECTS_DIR = tmp/release
|
||||
MOC_DIR = tmp/release
|
||||
RCC_DIR = tmp/release
|
||||
}
|
@ -1,84 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindow</class>
|
||||
<widget class="QMainWindow" name="MainWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>293</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Synergy Plugin Downloader</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTextEdit" name="m_pTextEditInfo">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="undoRedoEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="m_pLabelTip">
|
||||
<property name="text">
|
||||
<string>Processing, please wait...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menuBar">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
@ -1,13 +0,0 @@
|
||||
#ifndef ARGUMENTS_H
|
||||
#define ARGUMENTS_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
class Arguments
|
||||
{
|
||||
public:
|
||||
QString email;
|
||||
QString password;
|
||||
};
|
||||
|
||||
#endif // ARGUMENTS_H
|
@ -1,5 +0,0 @@
|
||||
#include "Authenticate.h"
|
||||
|
||||
Authenticate::Authenticate()
|
||||
{
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
#ifndef AUTHENTICATE_H
|
||||
#define AUTHENTICATE_H
|
||||
|
||||
class Authenticate
|
||||
{
|
||||
public:
|
||||
Authenticate();
|
||||
};
|
||||
|
||||
#endif // AUTHENTICATE_H
|
@ -1,31 +0,0 @@
|
||||
#include "MainWindow.h"
|
||||
#include "ui_MainWindowBase.h"
|
||||
|
||||
MainWindow::MainWindow(Arguments& args, QWidget* parent) :
|
||||
QMainWindow(parent),
|
||||
m_Arguments(args)
|
||||
{
|
||||
setupUi(this);
|
||||
appendInfo(m_Arguments.email);
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
}
|
||||
|
||||
void MainWindow::changeEvent(QEvent* e)
|
||||
{
|
||||
QMainWindow::changeEvent(e);
|
||||
switch (e->type()) {
|
||||
case QEvent::LanguageChange:
|
||||
retranslateUi(this);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::appendInfo(QString& s)
|
||||
{
|
||||
m_pTextEditInfo->append(s);
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include "Arguments.h"
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
#include "ui_MainWindowBase.h"
|
||||
|
||||
class MainWindow : public QMainWindow, public Ui::MainWindow {
|
||||
Q_OBJECT
|
||||
public:
|
||||
MainWindow(Arguments& args, QWidget* parent = 0);
|
||||
~MainWindow();
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent* e);
|
||||
|
||||
private:
|
||||
void appendInfo(QString& s);
|
||||
|
||||
private:
|
||||
Arguments m_Arguments;
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
@ -1,27 +0,0 @@
|
||||
#include "MainWindow.h"
|
||||
#include "Arguments.h"
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
|
||||
void parseArgs(Arguments& args, int argc, char* argv[])
|
||||
{
|
||||
for (int i = 1; i < argc; i++) {
|
||||
if (strcmp(argv[i], "--email") == 0) {
|
||||
args.email = argv[++i];
|
||||
}
|
||||
if (strcmp(argv[i], "--password") == 0) {
|
||||
args.password = argv[++i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
Arguments args;
|
||||
parseArgs(args, argc, argv);
|
||||
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w(args);
|
||||
w.show();
|
||||
return a.exec();
|
||||
}
|
Loading…
Reference in New Issue
Block a user