summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Collapse)AuthorAgeFilesLines
* Reduce codeManuel Schneider2014-05-201-2/+2
| | | | | * Reduce code of prepareForProjection (broadcast part) * Make toolbar icons 48x48 px (were too large for standard windowsize)
* Changed Layout of helpWindow. Set Icon + Text into QFormLayout.Björn Hagemeister2014-05-191-67/+217
|
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-05-191-11/+5Star
|\
| * Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-05-191-6/+27
| |\
| * | Make toolbar static on left sideManuel Schneider2014-05-161-11/+5Star
| | | | | | | | | | | | | | | | | | | | | * Redudce unnecessary codebase by dropping curious nested timerId & timerTimeout * Use the resizeEvent properly * Make size of buttons static * Drop unnecesary ui properties
* | | Help windowBjörn Hagemeister2014-05-193-44/+230
| | |
* | | Commiting forgotten icon, plus first changes on help - Button ↵Björn Hagemeister2014-05-193-0/+57
| |/ |/| | | | | implementation, which is not correctly working right now.
* | Changing some icons plus adding Button "help" without implementing its function.Björn Hagemeister2014-05-161-6/+27
|/ | | | The button broadcast is just set to invisible, not deleted!
* Several changes:Manuel Schneider2014-05-161-0/+10
| | | | | | | | | | * Change the messagebox text * Add button stub for exclusiveStudentToTutor * Split prepareProjection in broacast, unicast and exclusiveunicast (stub) * Make multiple used, hardcoded strings static const member of mainwindow * Replace multiple loops asking for selection and tutor by membervariable * references to the connectionframe of the latter * Complete missing error messages
* Changes the ConnectionWidows gui to a relative layout. Added a stacked widget toManuel Schneider2014-05-062-122/+171
| | | | | change between checkmark and the rest. Changed the non expressive names of ui elements.
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-05-062-4/+31
|\ | | | | | | | | | | Conflicts: gui/client/toolbar.ui src/client/connectwindow/connectwindow.cpp
| * Adding flashy Symbol for working connection of client to server.Björn Hagemeister2014-05-052-7/+42
| | | | | | | | And commenting class ConnectionWindow from client.
* | Changes the approach of Qt Gui initialization to the member pointer ↵Manuel Schneider2014-05-062-15/+23
|/ | | | approach. This means multiple inheritance is avoided and the form is now a member pointer of the class. Immlicitely renamed some ui elements for clearification. Again changed unnecessary use of QDialog to QWidget.
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-04-231-1/+1
|\
| * Proper translated concect stringManuel Schneider2014-04-231-1/+1
| |
* | Delete accidental temp-file commitBjörn Hagemeister2014-04-231-553/+0Star
|/
* Adding Button for setting Tutor manually.Björn Hagemeister2014-04-221-4/+27
|
* Add GUI changessr2013-02-073-24/+571
|
* Initial commitsr2013-02-044-0/+556