Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes since the evaluation #1

Open
wants to merge 39 commits into
base: evaluation
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b386da9
work in progress
0003088 Jul 21, 2014
1a83d8b
started to implement new hierarchy, added testfiles
Jul 30, 2014
1a8fab3
Merge remote-tracking branch 'qt-gui/master'
Jul 30, 2014
d631442
still working on hierarchy
Jul 30, 2014
6736715
populate metaModel only once
Jul 31, 2014
e4b2152
fixed mess with metakeys
Jul 31, 2014
4f699a1
moved keyset inside model, fixed metakeys
Aug 1, 2014
3927fe4
Creating keys seems to work, needs further testing
Aug 1, 2014
2efb021
create new Key with metakeys
Aug 2, 2014
1ed29b3
added undoManager
Aug 2, 2014
1179814
experimental support for undo/redo after editing existing keynames/
Aug 2, 2014
fe811b4
fixed selection problem in TableView, added icon to search, changed
Aug 2, 2014
8f63048
minor changes
Aug 3, 2014
4fb9b2b
moved keyset out of modelconstructor due to horrible performance
0003088 Aug 8, 2014
e2f08c7
changed RowLayout to GridLayout in NewKeyWindow
Aug 17, 2014
1bc290f
Merge branch 'master' of github.com:0003088/qt-gui
Aug 17, 2014
39b57bd
moved the contents of EditKeyWindow in an separate qml file
Aug 17, 2014
d445b46
moved contents of NewKeyWindow to separate qml file
Aug 17, 2014
83c3f3d
Fixed problem that name & value fields were not updated when undoing/
Aug 17, 2014
f4748f1
added experimental support for undo/redo of existing metakeys. Only
0003088 Aug 18, 2014
1cba35f
Added check if user has edited metadata
Aug 19, 2014
c7ff079
added undoCommand for deleting a key
Aug 21, 2014
beddf22
Added correct updates of views when undoing/redoing node deletion
Aug 21, 2014
0bad1de
A few minor changes, nothing substantial at all
Aug 22, 2014
e33a59a
Fixed bug when inserted keys would not appear after synchronizing
Aug 22, 2014
808c4a4
fixed bug when removing metakeys
0003088 Aug 22, 2014
1a61a78
renamed undocommand classes, started to implement newkeycommand
0003088 Aug 26, 2014
17852a8
implemented newkeycommand
Aug 27, 2014
bedd73a
added copy and paste command classes
Aug 27, 2014
4aa336f
grey out row in tableview if row is selected for copy
0003088 Aug 27, 2014
9d58944
added clipboard access in undomanager
Aug 28, 2014
5878ba5
implemented copy/paste
Aug 28, 2014
7372618
started to implement cut/paste
Aug 29, 2014
0e83895
fixed problem with multiple pasting after cutting a key
0003088 Aug 29, 2014
add9cd7
added CMakeLists.txt
0003088 Aug 29, 2014
e50ce4b
minor version changes of qtquick modules to make app compatible to qt5.2
Aug 30, 2014
5cf114e
added deleting treebranches (incl. undo/redo)
Aug 30, 2014
d6ba9fe
moved Menubar to separate file to improve clarity
Sep 3, 2014
acfe006
fixed wrong display of metakeydeletebutton when built with cmake instead
0003088 Sep 3, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
cmake_minimum_required( VERSION 2.8 )
project(qt-gui)

set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")

set( CMAKE_BUILD_TYPE Debug )

add_definitions ( -Wall )

find_package ( Qt5 REQUIRED Quick Gui Core Qml Widgets Test)

include_directories (
${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Qt5Quick_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS}
/usr/include/elektra
/usr/local/include/elektra)

set ( qt-gui_HDRS
src/visitor.hpp
src/printvisitor.hpp
src/keysetvisitor.hpp
src/newkeycommand.hpp
src/editkeycommand.hpp
src/deletekeycommand.hpp
src/cutkeycommand.hpp
src/copykeycommand.hpp
)

set ( qt-gui_SRCS
src/main.cpp
src/treeviewmodel.cpp
src/confignode.cpp
src/printvisitor.cpp
src/keysetvisitor.cpp
modeltest/dynamictreemodel.cpp
modeltest/modeltest.cpp
src/undomanager.cpp
src/newkeycommand.cpp
src/deletekeycommand.cpp
src/editkeycommand.cpp
src/copykeycommand.cpp
src/cutkeycommand.cpp
)

set ( qt-gui_RSCS
resources.qrc
)

qt5_add_resources(RSCS ${qt-gui_RSCS})

add_executable ( qt-gui ${qt-gui_SRCS} ${UIS} ${RSCS} ${TRS} )

qt5_use_modules(qt-gui Quick Gui Core Qml Widgets)

target_link_libraries ( qt-gui ${Qt5Quick_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Test_LIBRARIES} elektra)
Loading