Diffusion Kexi cdd7411223ff

Merge branch 'master' into cool_main_window-staniek6

Authored by staniek on Mar 26 2018, 7:01 PM.

Description

Merge branch 'master' into cool_main_window-staniek6

  1. Conflicts:
  2. src/kexiutils/CMakeLists.txt
  3. src/main/KexiMainWindow.cpp
  4. src/main/KexiMainWindow.h
  5. src/main/KexiMainWindow_p.cpp
  6. src/main/KexiMainWindow_p.h
  7. src/main/startup/KexiStartupDialog.cpp
  8. src/plugins/forms/kexidatasourcepage.cpp
  9. src/plugins/forms/kexidatasourcepage.h
  10. src/plugins/forms/kexiformview.cpp
  11. src/plugins/forms/widgets/kexidbform.cpp
  12. src/plugins/importexport/csv/kexicsvexport.cpp
  13. src/plugins/importexport/csv/kexicsvexportwizard.cpp
  14. src/plugins/queries/kexiquerydesignerguieditor.cpp
  15. src/plugins/queries/kexiquerypart.cpp
  16. src/plugins/queries/kexiquerypart.h
  17. src/plugins/queries/kexiqueryview.cpp
  18. src/plugins/reports/KexiDBReportDataSource.cpp
  19. src/plugins/reports/kexireportpart.cpp
  20. src/plugins/reports/kexireportview.cpp
  21. src/plugins/scripting/kexidb/kexidbconnection.cpp
  22. src/plugins/scripting/kexidb/kexidbmodule.cpp
  23. src/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
  24. src/plugins/scripting/kexiscripting/kexiscriptpart.cpp
  25. src/plugins/tables/kexitabledesignerview.cpp
  26. src/plugins/tables/kexitablepart.cpp
  27. src/tests/newapi/main.cpp
  28. src/tests/startup/main.cpp
  29. src/widget/KexiFileWidget.cpp
  30. src/widget/KexiStartupFileHandler.cpp
  31. src/widget/dataviewcommon/kexidataprovider.cpp
  32. src/widget/tableview/KexiTableScrollArea.cpp
  33. src/widget/tableview/kexicomboboxpopup.cpp

Details

Committed
staniekMar 26 2018, 7:01 PM
Differential Revision
D11778: Cool main window for KEXI 3.2
Parents
R71:bd0e43ffd09c: GIT_SILENT Minor fixes needed after merge
R71:845c95396aee: Merge branch '3.1'
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
845c95396aeestaniek
Merge branch '3.1' 
Mar 26 2018
4492604fbb7bstaniek
GIT_SILENT Do not use too new QLineEdit::selectionLength() API 
Mar 26 2018
d5772b579facstaniek
Merge branch '3.1' 
Mar 26 2018
fbc39fd7af09staniek
Project type selection in the new project assistant: do not assume user clicked… 
Mar 26 2018
fceff4e57ee1staniek
Assistants: properly focus input boxes after moving to other page, make… 
Mar 26 2018
0a6e5d25819al10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 26 2018
3acfd668ab8dstaniek
KexiLinkWidget: add support for shortcuts and triggering a click 
Mar 24 2018
3447953167ffl10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 23 2018
3f102c933775l10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 23 2018
3dbf2567d496staniek
Merge branch '3.1' 
Mar 23 2018
7c1e67632998staniek
Make appdata.xml, app icons and kexi.desktop co-installable 
Mar 23 2018
b1a9f6f68454staniek
Fix data install dir for Windows, make icons installed relative to that 
Mar 22 2018
b20ef2a594a2l10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 22 2018
4eb92529c0ddstaniek
Merge remote-tracking branch 'origin/3.1' 
Mar 21 2018
14dada252f59D11544staniek
Fix build with Qt 5.6 
Mar 21 2018
3c2210cf459cl10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 21 2018
8ac166ae4910staniek
Merge remote-tracking branch 'origin/3.1' 
Mar 20 2018
1578fcb4a040D11503asturmlechner
Fix build with Qt 5.11 (missing headers) 
Mar 20 2018
91c048926189lueck
fix invalid xml markup 
Mar 20 2018
fea9c376429estaniek
Merge branch '3.1' 
Mar 19 2018
599f1810aff6staniek
Update and add more KEXI screenshots, update home page and bug report URL 
Mar 19 2018
902bd96bf1b8staniek
More Kexi -> KEXI 
Mar 19 2018
672ef6962595l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 15 2018
178f1f6673acstaniek
Improve display of tried locations for resources lookup and lookup algorithm 
Mar 13 2018
f4c9aa0dabc7staniek
Create (and install) rcc files with kexi icons in co-installable dirs 
Mar 13 2018
31a3901ce43al10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 13 2018
13eb4177a92el10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 13 2018
1777613c0883l10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 13 2018
4d9920fe92aepino
Merge remote-tracking branch 'origin/3.1' 
Mar 12 2018
12eed3a629a0pino
Install the application icons 
Mar 12 2018
1be73e2d8890staniek
Improve message tags: add @info comment to make current or future semantic tags… 
Mar 12 2018
6fa40028f175staniek
Merge remote-tracking branch 'origin/3.1' 
Mar 12 2018
41dff828c972staniek
GIT_SILENT Version 3.1.0 
Mar 6 2018
4c206602a865staniek
Disable compacting action if project is not open as we do not support this case… 
Mar 6 2018
7f6021673765l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 6 2018
35b706fce35aD11000staniek
Add MainWindow/GlobalSearchBoxEnabled (bool) option that controls display of… 
Mar 5 2018
fdc64d6ffd52D11000staniek
Add MainWindow/GlobalSearchBoxEnabled (bool) option that controls display of… 
Mar 5 2018
713d71d9b879l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 5 2018
a0166350c54astaniek
Merge branch '3.1' 
Mar 3 2018
4c4dce0a9670D10963staniek
Fix crash when global search box is used after re-opening another project 
Mar 3 2018
0197a85e4de2l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 3 2018
631d4dd62babyurchor
Fix minor typos 
Mar 2 2018
b0d4bb0844f3l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 2 2018
86b3cee08a78D10780staniek
Kexi -> KEXI globally, KEXI_APP_NAME -> QApplication::applicationDisplayName() 
Mar 1 2018
54ee1fe512a5staniek
Merge branch '3.1' 
Feb 27 2018
8b0b1d658466staniek
GIT_SILENT Disable windows warning for GetVersionEx() 
Feb 27 2018
ae165d1f04b6staniek
Merge branch '3.1' 
Feb 27 2018
33c634ffe931staniek
Mark and install Kexi example file as read-only on all platforms 
Feb 27 2018
cb1ce68e216bstaniek
Merge branch '3.1' 
Feb 26 2018
085917d1cd71staniek
GIT_SILENT Simplify note in COPYING.LIB and remove tabs 
Feb 26 2018