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 from upstream #4

Merged
merged 247 commits into from
Dec 11, 2021
Merged

Conversation

deepsidhu1313
Copy link
Owner

Changes from upstream

MKleusberg and others added 30 commits August 24, 2020 10:57
Also, the handler is simplified. We only need to store the possible
message.

See issue #1069
- Remove path in program name
- Avoid tabs for tabular formatting which are not portable
- Break long lines (80 characters maximum)
- Add reference to project files
- Use traditional syntax: <placeholder> [optional]
  See https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_01
      https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/command-line-syntax-key

See issue #1069
This fixes creating new branches or pushing to a different existing
branch than the currently checked out branch.
This adds a new row to the Push dialog in which you can set the user
name in case you want to push to a different account.
Remove the default and auto-default properties of the cancel button in the
"Fetching data..." dialog.

See issue #2383
Due to use of '<>' characters, the text has to be escaped for HTML.

See issue #1069
And avoid removing extension when printing command name in help message.

See issue #1069
Two options are added for the command line:

    -c [config_file]
    --config [config_file]

We can also use environment variables without using options on the command line.
export DB4S_CONFIG_FILE=[config_file]

If there is an environment variable and use the -c or --config option, the environment variable is ignored.

See  issue #2317.
Change to 'Preferences' expression instead of 'Configuration' expression for consistent.
See the issue #2393
This adds a new context menu action called "Freeze Columns" to the
context menu which appears when you right click the column headers in
a Browse Data dock. With this action all columns from the first up to
the clicked column are fixed in place when you scroll horizontally. This
can be used to make for example the id column always visible.

See issue #1888.
- Delete old translation file(sqlb_ko_KR.qph).
- Translate for all translatable entries.
- Modify to maintain unity between words.
- Fix several typos and grammatical errors
…nt (#2394)

* Change 'Preferences' to 'Settings' for natural expression. See the issue #2393

* Add filter for INI file

* Add 'Export Settings' and 'Import Settings' buttons In Preferences dialog

* Add validation of whether it is a normal settings file
According to Qt documentation:
> Reopening a QTemporaryFile after calling close() is safe. For as long as
> the QTemporaryFile object itself is not destroyed, the unique temporary
> file will exist and be kept open internally by QTemporaryFile.

Keeping the file open by DB4S means that later it cannot be opened by the
external application in Windows, since it is locked.

See issue #2402
- PreferencesDialog::importSettings() calls MainWindow::reloadSettings() indirectly
- PreferencesDIalog::exportSettings() calls PreferencesDialog::saveSettings() when beginning
- Settings::importSettings() clear m_hCache
- Update Korean translation that can be translated from the above changes
And not to the cell editor. This will avoid a redundant click to Apply,
when the user has just pressed Apply instead of Cancel in the dialog.

See issue #2402
Add note about -DFORCE_INTERNAL_QSCINTILLA=ON to Ubuntu and Debian in…
This commit fixes an issue where the bottom buttons of
'PreferencesDialog' are positioned erratically on non-macOS platforms.
For further information, refer to 'Need Help' section of #2394 PR.
* Add new checkbox in Preferences

* Update PreferencesDialog.cpp for new checkbox

* Add default value for new setting.

* Update MainWindow.cpp for handle new checkbox

* Update Korean translation for this branch

* Correct the label text clearly and add hints
* Initial Dutch (nl) translation for v3.12.1
* Added missing translation phrase for AddRecordDialog and fixed a typo
* Added the proper references in configuration files to compile the Dutch translation into the build.
* Amended translations with changes requested in review 504832399.
* Fix CMakeLists.txt
* Correct one untranslated item

Co-authored-by: SeongTae Jeong <seongtaej98@gmail.com>
MKleusberg and others added 29 commits August 11, 2021 11:49
This is a first attempt to use cmake instead of qmake for building our
nightlies on macOS. We are using cmake on most platforms and it would be
easier for us to only maintain one build system. Because support for
qmake is dropped in Qt6 anyway it makes sense to transition to only
using cmake in the near-ish future.

Please note that this commit has been assembled in a mostly blind
fashion. I would be surprised if this worked without further tweaking.
This adds the moc header files to the dependencies of the executable in
the cmake project so they show up in their proper location in QtCreator.
This makes it more pleasant to use the cmake files as a QtCreator
project file.

Also rework the CMakeLists.txt file a bit by fixing whitespace issues,
rearranging some blocks and unifying the code style a bit.
This removes all mentions of the qmake build system from our build
instructions because we are planning to remove support for qmake in the
near future. Building using cmake should work fine on all platforms.
In commit 33ee736 we have started
moving the macOS build scripts towards using cmake instead of qmake.
This commit fixes some issues introduced in that commit.

Do not call lupdate and lrelease any more because they rely on the qmake
project files and are called by cmake anyway.

Make sure cmake is reinstalled via brew after removing any installed
brew packages.

Set a hint to the Qt5 library path so cmake should be able to find it.
The QScintilla property is used to provide a new setting.

See issue #2800
…dirs

Runs automatically from cron every month, on the 14th day of each month.

It's pretty simple, but should do the job
This deletes all qmake project files. To simplify things and in
preparation for Qt6 support we are now only supporting cmake builds.
This moves the code to remove comments from SQL statements from the
SqliteTableModel class to Data.cpp making it a free function. This
removes some dependencies from the SqliteTableModel class with all its
dependencies.

Also simplify the CMakeLists.txt file for the tests by removing all the
dependencies which are not really required.
This fixes a possible crash when browsing a table without a rowid column
and with multiple columns in its primary key. To work with these tables
we need to pretend it still has only one primary key column (as in the
rowid case) and to do so we combine all the values of the primary key
columns into a single value. For simplicity we were using the JSON
library (which we are using anyway in the project) to achieve this,
however this turned out to be problematic for some values. This commit
introduced a new, more robust approach to combine multiple values into a
single value.

See issue #2832.
Windows builds were broken by 38907cc
which removed the xstr macro.

See issue #2810.
Fixed with Inkscape "File > Save as... > Normal SVG".

See related issue #2833
These were added as own work in 36054cd

Cleaned using Inkscape "File > Save as... > Normal SVG".

See related issue #2833
3.12.2 doesn't work on macOS 10.13, but 3.12.0 does on 10.12
Just a small thank you for this great project.
Fixes, consistency improvements, and link conversion to HTTPS
@deepsidhu1313 deepsidhu1313 merged commit ed4f706 into deepsidhu1313:master Dec 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet