lp:fos/v0.1

Created by Florian Mahlknecht and last modified
Get this branch:
bzr branch lp:fos/v0.1
Members of FOS Development Team can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
FOS Development Team
Project:
FOS
Status:
Mature

Recent revisions

26. By Florian Mahlknecht

Changed protocol by merging all initial data that has to be sent (locations, tables, categories, products) to the newly declared type InitialData. Updated the client, that expects now a InitialData as first object. Removed fos::json::registerAllTypes by moving it to a static object initialization, so it hasn't to be called anymore in constructors. Updated logout() slot, which now uses the json api. Added non working icon on phone by generating client/android/res (through QtCreator).

25. By Mazzon Alex

created the qml property loggedIn for the class Client. After login() is called now loginFailed() or loggedInChanged() will be emitted. The signal loginSuccessful is no longer needed and has been removed.

24. By Mazzon Alex

added transitions from from and to the settings interface. * created a bar on top of the login and settings interface witch contains the title of the interface. on the right corner of the login bar the settings button is placed and on the right corner of the settings interface the save button. * tests have been made with this revision from desktop and with the smartphones via router and it seems like everything that is needed for FOS v0.1 is working

23. By Florian Mahlknecht

Defined all json types in json.h and improved the conversion code. Until now the types Tables, Login and Logout are expected to work properly with toJson() and parseJson()

22. By Mazzon Alex

added transitions from from and to the settings interface. * added an icon to the save button in the settings interface

21. By Mazzon Alex

added member variable m_loggedIn:bool witch tells if a user is logged in or not. * implemented the timer * changed the settings icon * last TODO use JSON Objects (use API in folder common)

20. By Florian Mahlknecht

Updated to qt 5.2 by removing most of the android folder and mergin the newly generated qtquick2applicationvier (see http://blog.qt.digia.com/blog/2013/10/09/android-deployment-in-qt-5-2/)

19. By Florian Mahlknecht

Added json namespace with json type definitions and conversion from types to json strings and viceversa (not completed yet). Added server tests with some initial unit tests. Documentation is still missing --> TODO

18. By Mazzon Alex

put the settings button on top and smaller * transition from orderman to login window added * set the application name to FOS orderman * now it is possible to select by mouse and keyboard * handling the tab key in a user intuitive way * set the focus on TextEdit username when the loginwindow is ready * created a function login() in Login.qml * handling also the return key now (login when return is pressed) * optimised the client: Now all functionality is based on signals and slots. (TODO connect c++ signals to qml slots\!) * added timeout functionality (not finished yet, view TODOs)

17. By Florian Mahlknecht

Improved the login handling by moving it to a new thread with a timeout
(currently 30sec) on read. Client threads will now be created not before
a client logs in successfully. Minor UI-improvements.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:fos/trunk
This branch contains Public information 
Everyone can see this information.