<table><tr><td style="">staniek updated this revision to Diff 34002.<br />staniek edited the summary of this revision. <a href="https://phabricator.kde.org/transactions/detail/PHID-XACT-DREV-cxsnminxmbxaphs/">(Show Details)</a><br />staniek added a comment.<br />Restricted Application added a subscriber: Kexi-Devel-list.

</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D11778">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">

<li class="remarkup-list-item">Merge remote-tracking branch 'origin/master' into cool_main_window-staniek6</li>

<li class="remarkup-list-item">Merge branch 'master' into cool_main_window-staniek6</li>

<li class="remarkup-list-item">Merge remote-tracking branch 'origin/cool_main_window-staniek6' into cool_main_window-staniek6</li>

</ul></div></div><br /><div><strong>CHANGES TO REVISION SUMMARY</strong><div><div style="white-space: pre-wrap; color: #74777D;"><div style="padding: 8px 0;">...</div>- Property pane's layout needs further layout cleanups and stylization, ultimately a move from list view to form for all properties, for now we have a form for data related properties only; the functionality would be coded in KProperty 3.2 though<span style="padding: 0 2px; color: #333333; background: rgba(251, 175, 175, .7);"><br />

</span></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R71 Kexi</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D11778?vs=30834&id=34002">https://phabricator.kde.org/D11778?vs=30834&id=34002</a></div></div><br /><div><strong>BRANCH</strong><div><div>cool_main_window-staniek6</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D11778">https://phabricator.kde.org/D11778</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />

src/core/CMakeLists.txt<br />

src/core/KexiMainWindowIface.cpp<br />

src/core/KexiMainWindowIface.h<br />

src/core/KexiView.cpp<br />

src/core/KexiView.h<br />

src/core/KexiWindow.cpp<br />

src/core/kexi.cpp<br />

src/core/kexi.h<br />

src/core/kexiblobbuffer.cpp<br />

src/core/kexidataiteminterface.cpp<br />

src/core/kexipart.cpp<br />

src/core/kexipart.h<br />

src/core/kexipartbase.cpp<br />

src/core/kexipartbase.h<br />

src/core/kexipartinfo.cpp<br />

src/core/kexipartinfo.h<br />

src/core/kexipartinfo_p.h<br />

src/core/kexiproject.cpp<br />

src/core/kexisharedactionhost.cpp<br />

src/formeditor/CMakeLists.txt<br />

src/formeditor/WidgetTreeWidget.cpp<br />

src/formeditor/commands.cpp<br />

src/formeditor/container.cpp<br />

src/formeditor/factories/KexiStandardFormWidgetsFactory.h<br />

src/formeditor/form.cpp<br />

src/formeditor/form.h<br />

src/formeditor/formIO.cpp<br />

src/formeditor/kexiactionselectiondialog.cpp<br />

src/formeditor/objecttree.cpp<br />

src/formeditor/utils.cpp<br />

src/formeditor/widgetfactory.cpp<br />

src/formeditor/widgetlibrary.cpp<br />

src/formeditor/widgetwithsubpropertiesinterface.cpp<br />

src/kexiutils/CMakeLists.txt<br />

src/kexiutils/FlowLayout.cpp<br />

src/kexiutils/KexiFadeWidgetEffect.cpp<br />

src/kexiutils/KexiIcon.h<br />

src/kexiutils/debuggui.cpp<br />

src/kexiutils/style/KexiPropertyPaneLineEditStyle.cpp<br />

src/kexiutils/style/KexiPropertyPaneLineEditStyle.h<br />

src/kexiutils/style/KexiStyle.cpp<br />

src/kexiutils/style/KexiStyle.h<br />

src/kexiutils/utils.h<br />

src/main/CMakeLists.txt<br />

src/main/KexiGlobalViewModeSelector.cpp<br />

src/main/KexiGlobalViewModeSelector.h<br />

src/main/KexiGlobalViewModeSelector_p.h<br />

src/main/KexiMainWindow.cpp<br />

src/main/KexiMainWindow.h<br />

src/main/KexiMainWindow_p.cpp<br />

src/main/KexiMainWindow_p.h<br />

src/main/KexiObjectViewTabWidget.cpp<br />

src/main/KexiObjectViewTabWidget.h<br />

src/main/KexiObjectViewWidget.cpp<br />

src/main/KexiObjectViewWidget.h<br />

src/main/KexiSearchLineEdit.cpp<br />

src/main/startup/KexiNewProjectAssistant.cpp<br />

src/main/startup/KexiStartupDialog.cpp<br />

src/main/startup/KexiWelcomeStatusBar.cpp<br />

src/migration/AlterSchemaWidget.cpp<br />

src/migration/importtablewizard.cpp<br />

src/migration/importwizard.cpp<br />

src/migration/keximigrate.cpp<br />

src/migration/mdb/src/keximdb/mdbmigrate.cpp<br />

src/migration/spreadsheet/spreadsheetmigrate.cpp<br />

src/mobile/KexiMobileMainWindow.cpp<br />

src/mobile/KexiMobileMainWindow.h<br />

src/mobile/KexiMobileToolbar.cpp<br />

src/mobile/KexiMobileWidget.cpp<br />

src/pics/icons/breeze/actions/16/edit-clear-small.svg<br />

src/pics/icons/breeze/actions/16/mode-selector-design.svg<br />

src/pics/icons/breeze/actions/16/mode-selector-edit.svg<br />

src/pics/icons/breeze/actions/16/mode-selector-sql.svg<br />

src/pics/icons/breeze/actions/22/mode-selector-design.svg<br />

src/pics/icons/breeze/actions/22/mode-selector-edit.svg<br />

src/pics/icons/breeze/actions/22/mode-selector-sql.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-design.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-edit.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-help.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-project.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-sql.svg<br />

src/pics/icons/breeze/actions/32/mode-selector-welcome.svg<br />

src/pics/kexi_breeze_files.cmake<br />

src/plugins/forms/CMakeLists.txt<br />

src/plugins/forms/KexiFormScrollAreaWidget.cpp<br />

src/plugins/forms/kexidatasourcepage.cpp<br />

src/plugins/forms/kexidatasourcepage.h<br />

src/plugins/forms/kexiformpart.cpp<br />

src/plugins/forms/kexiformpart.h<br />

src/plugins/forms/kexiformscrollview.cpp<br />

src/plugins/forms/kexiformview.cpp<br />

src/plugins/forms/kexiformview.h<br />

src/plugins/forms/widgets/kexidbautofield.cpp<br />

src/plugins/forms/widgets/kexidbcombobox.cpp<br />

src/plugins/forms/widgets/kexidbform.cpp<br />

src/plugins/forms/widgets/kexidbimagebox.cpp<br />

src/plugins/forms/widgets/kexidbutils.cpp<br />

src/plugins/forms/widgets/mapbrowser/MapBrowserFactory.cpp<br />

src/plugins/forms/widgets/webbrowser/WebBrowserFactory.cpp<br />

src/plugins/importexport/csv/kexicsvexport.cpp<br />

src/plugins/importexport/csv/kexicsvimportdialog.cpp<br />

src/plugins/queries/CMakeLists.txt<br />

src/plugins/queries/kexiquerydesignerguieditor.cpp<br />

src/plugins/queries/kexiquerypart.cpp<br />

src/plugins/queries/kexiquerypart.h<br />

src/plugins/queries/kexiqueryview.cpp<br />

src/plugins/reports/CMakeLists.txt<br />

src/plugins/reports/KexiDBReportDataSource.cpp<br />

src/plugins/reports/kexireportdesignview.cpp<br />

src/plugins/reports/kexireportpart.cpp<br />

src/plugins/reports/kexireportpart.h<br />

src/plugins/reports/kexireportview.cpp<br />

src/plugins/reports/kexisourceselector.h<br />

src/plugins/reports/krscriptfunctions.cpp<br />

src/plugins/scripting/kexidb/kexidbconnection.cpp<br />

src/plugins/scripting/kexidb/kexidbcursor.cpp<br />

src/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp<br />

src/plugins/tables/CMakeLists.txt<br />

src/plugins/tables/kexilookupcolumnpage.cpp<br />

src/plugins/tables/kexilookupcolumnpage.h<br />

src/plugins/tables/kexitabledesignercommands.cpp<br />

src/plugins/tables/kexitabledesignerview.cpp<br />

src/plugins/tables/kexitabledesignerview_p.cpp<br />

src/plugins/tables/kexitablepart.cpp<br />

src/plugins/tables/kexitablepart.h<br />

src/tests/altertable/altertable.cpp<br />

src/tests/newapi/cursors_test.h<br />

src/tests/newapi/dbcreation_test.h<br />

src/tests/newapi/dr_prop_test.h<br />

src/tests/newapi/main.cpp<br />

src/tests/parser/main.cpp<br />

src/tests/startup/main.cpp<br />

src/widget/CMakeLists.txt<br />

src/widget/KexiDataSourceComboBox.cpp<br />

src/widget/KexiFileWidget.cpp<br />

src/widget/KexiListView.cpp<br />

src/widget/KexiListView.h<br />

src/widget/KexiListView_p.h<br />

src/widget/KexiObjectInfoLabel.h<br />

src/widget/KexiProjectSelectorWidget.cpp<br />

src/widget/KexiStartupFileHandler.cpp<br />

src/widget/KexiWidgetWidthAnimator.cpp<br />

src/widget/KexiWidgetWidthAnimator.h<br />

src/widget/dataviewcommon/kexidataawareobjectiface.cpp<br />

src/widget/dataviewcommon/kexidataawareobjectiface.h<br />

src/widget/dataviewcommon/kexidataawarepropertyset.cpp<br />

src/widget/dataviewcommon/kexidataprovider.cpp<br />

src/widget/kexiqueryparameters.cpp<br />

src/widget/kexisectionheader.cpp<br />

src/widget/navigator/KexiProjectItemDelegate.cpp<br />

src/widget/navigator/KexiProjectModelItem.cpp<br />

src/widget/navigator/KexiProjectNavigator.cpp<br />

src/widget/properties/KexiCustomPropertyFactory_p.cpp<br />

src/widget/properties/KexiObjectInfoWidget.cpp<br />

src/widget/properties/KexiObjectInfoWidget.h<br />

src/widget/properties/KexiPropertyEditorView.cpp<br />

src/widget/properties/KexiPropertyEditorView.h<br />

src/widget/properties/KexiPropertyPaneLineEdit.cpp<br />

src/widget/properties/KexiPropertyPaneLineEdit.h<br />

src/widget/properties/KexiPropertyPaneViewBase.cpp<br />

src/widget/properties/KexiPropertyPaneViewBase.h<br />

src/widget/properties/KexiPropertyPaneWidget.cpp<br />

src/widget/properties/KexiPropertyPaneWidget.h<br />

src/widget/relations/CMakeLists.txt<br />

src/widget/relations/KexiRelationsConnection.cpp<br />

src/widget/relations/KexiRelationsScrollArea.cpp<br />

src/widget/relations/KexiRelationsTableContainer_p.cpp<br />

src/widget/relations/KexiRelationsView.cpp<br />

src/widget/tableview/KexiDataTableScrollArea.cpp<br />

src/widget/tableview/KexiTableScrollArea.cpp<br />

src/widget/tableview/KexiTableScrollArea_p.cpp<br />

src/widget/tableview/kexiblobtableedit.cpp<br />

src/widget/tableview/kexibooltableedit.cpp<br />

src/widget/tableview/kexicomboboxpopup.cpp<br />

src/widget/tableview/kexicomboboxtableedit.cpp<br />

src/widget/tableview/kexidatetableedit.cpp<br />

src/widget/tableview/kexidatetimetableedit.cpp<br />

src/widget/tableview/kexiinputtableedit.cpp<br />

src/widget/tableview/kexitimetableedit.cpp<br />

src/widget/utils/kexicontextmenuutils.cpp</div></div></div><br /><div><strong>To: </strong>staniek, piggz<br /><strong>Cc: </strong>Kexi-Devel-list, KEXI, clybekk, barman, staniek<br /></div>