Git commit 3361cc41aae57e828655e4fe6b0c5d4dad448fd6 by Robby Stephenson. Committed on 05/08/2023 at 20:17. Pushed by rstephenson into branch 'master'.
Remove 'Tip of the Day' M +4 -0 ChangeLog M +2 -4 doc/configuration.docbook M +0 -22 doc/fundamentals.docbook D +0 -67 preparetips M +0 -6 src/config/tellico_config.kcfg M +0 -8 src/configdialog.cpp M +0 -1 src/configdialog.h M +0 -1 src/main.cpp M +0 -9 src/mainwindow.cpp M +0 -6 src/mainwindow.h M +1 -4 src/tellicoui.rc D +0 -107 tellico.tips https://invent.kde.org/office/tellico/-/commit/3361cc41aae57e828655e4fe6b0c5d4dad448fd6 diff --git a/ChangeLog b/ChangeLog index b698bdfb..a389916d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2023-08-02 Robby Stephenson <[email protected]> + + * Removed "Tip of the Day" dialog. + 2023-07-16 Robby Stephenson <[email protected]> * Removed author searches from Google Scholar. diff --git a/doc/configuration.docbook b/doc/configuration.docbook index f1d6dbba..c9bc6e81 100644 --- a/doc/configuration.docbook +++ b/doc/configuration.docbook @@ -34,10 +34,8 @@ Some minor settings can only be changed by editing the configuration file itself <para> The <guilabel>General Options</guilabel> control the general behavior. Images may be included in the data files, or saved separately in the &appname; application folder. Also, when &appname; -is started, it can automatically reopen the last data file that was open. The -<guilabel>Tip of the Day</guilabel> dialog contains helpful hints on using &appname; -and appears at program startup. You may want to read through some of the hints and -then disable the dialog. The <interface>Quick Filter</interface> in the toolbar is useful +is started, it can automatically reopen the last data file that was open. +The <interface>Quick Filter</interface> in the toolbar is useful for easily filtering through your collection and can utilize regular expressions. </para> diff --git a/doc/fundamentals.docbook b/doc/fundamentals.docbook index 66c077f7..fb8c3e1d 100644 --- a/doc/fundamentals.docbook +++ b/doc/fundamentals.docbook @@ -479,10 +479,6 @@ When an entry is checked-out, the <emphasis>Loaned</emphasis> field is set to <e <sect1 id="tips"> <title>General Tips</title> -<para> -These are the list of tips contained in the "Tip of the Day" list for &appname;. -</para> - <tip> <para>If a book has more than one author, you should separate their names by a semi-colon, so that Tellico will know to split them @@ -505,24 +501,6 @@ editor. </para> </tip> -<tip> -<para>If you want to filter by a <link linkend="bool"><emphasis>Checkbox</emphasis></link> field, a value of -"true" should be used. If you'd like to filter to -show only the science fiction books which you've not read, for -example, check the <guilabel>Match all of the -following</guilabel> button, set the first rule to have "Genre" -"contains" "Science Fiction" (no quotes) and the second rule to -have "Read" "does not contain" "true" (no quotes). -</para> -</tip> - -<tip> -<para>If a non-word character is used in the Quick Filter, the text is -interpreted as a regular expression. To show only books which are by Weber or Bujold, for example, then -type "weber|bujold" (no quotes) in the filter box. -</para> -</tip> - <tip> <para>You can edit more than one entry at a time, by holding down the &Shift; or &Ctrl; key and selecting multiple entries. diff --git a/preparetips b/preparetips deleted file mode 100755 index e79cc8c6..00000000 --- a/preparetips +++ /dev/null @@ -1,67 +0,0 @@ -#! /usr/bin/perl -# little script to extract the text from the tips file -# and output it, so xgettext can add the tips to the po file -# -# 2000 by Matthias Kiefer <[email protected]> - -# IMPORTANT NOTE: Do not change the output without checking if -# translations still work! - -sub printText -{ - my $text = $_[0]; - - if ( $text cmp "" ) - { - - # replace \ with \\ - $text =~ s/\\/\\\\/g; - - # replace " with \" - $text =~ s/"/\\"/g; - - print "\"$text\\n\"\n"; - } -} - -die "usage: $0 [tips file]" unless defined $ARGV[0]; -open(FILE,"<",$ARGV[0]) or die "unable to open tips file"; -if ( $^V ge v5.8.0 ) -{ - binmode(FILE,":utf8"); - binmode(STDOUT,":utf8"); -} - -$inTip=0; - -while(<FILE>) -{ - chomp; - - # tip starts with <html> - if(/^\s*<html>(.*)/io) - { - $inTip=1; - print "// i18n: file: $ARGV[0]:$.\n// i18n: ectx: \@info:tipoftheday\n"; - print "i18n("; - printText($1); - next; - } - - if($inTip!=0) - { - # tip ends with </html> - if(/^(.*)\s*<\/html>/io) - { - printText($1); - print ");\n\n"; - $inTip=0; - } - else - { - printText($_); - } - } -} - -close(FILE); diff --git a/src/config/tellico_config.kcfg b/src/config/tellico_config.kcfg index d0d7a606..7346a18e 100644 --- a/src/config/tellico_config.kcfg +++ b/src/config/tellico_config.kcfg @@ -8,12 +8,6 @@ <kcfgfile name="tellicorc"/> -<group name="TipOfDay"> - <entry key="RunOnStart" type="Bool" name="showTipOfDay"> - <default>true</default> - </entry> -</group> - <group name="Group View Options"> <entry key="SortColumn" type="Int" name="groupViewSortColumn"> <default>0</default> diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 0ebe53a6..9a284d2d 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -224,12 +224,6 @@ void ConfigDialog::initGeneralPage(QFrame* frame) { l->addWidget(m_cbQuickFilterRegExp); connect(m_cbQuickFilterRegExp, &QAbstractButton::clicked, this, &ConfigDialog::slotModified); - m_cbShowTipDay = new QCheckBox(i18n("&Show \"Tip of the Day\" at startup"), frame); - m_cbShowTipDay->setWhatsThis(i18n("If checked, the \"Tip of the Day\" will be " - "shown at program start-up.")); - l->addWidget(m_cbShowTipDay); - connect(m_cbShowTipDay, &QAbstractButton::clicked, this, &ConfigDialog::slotModified); - m_cbEnableWebcam = new QCheckBox(i18n("&Enable webcam for barcode scanning"), frame); m_cbEnableWebcam->setWhatsThis(i18n("If checked, the input from a webcam will be used " "to scan barcodes for searching.")); @@ -702,7 +696,6 @@ void ConfigDialog::initFetchPage(QFrame* frame) { void ConfigDialog::readGeneralConfig() { m_modifying = true; - m_cbShowTipDay->setChecked(Config::showTipOfDay()); m_cbQuickFilterRegExp->setChecked(Config::quickFilterRegExp()); m_cbOpenLastFile->setChecked(Config::reopenLastFile()); #ifdef ENABLE_WEBCAM @@ -802,7 +795,6 @@ void ConfigDialog::saveConfiguration() { } void ConfigDialog::saveGeneralConfig() { - Config::setShowTipOfDay(m_cbShowTipDay->isChecked()); Config::setQuickFilterRegExp(m_cbQuickFilterRegExp->isChecked()); Config::setEnableWebcam(m_cbEnableWebcam->isChecked()); diff --git a/src/configdialog.h b/src/configdialog.h index 498bc41d..68d0d40e 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -187,7 +187,6 @@ private: QRadioButton* m_rbImageInLocalDir; QCheckBox* m_cbOpenLastFile; QCheckBox* m_cbQuickFilterRegExp; - QCheckBox* m_cbShowTipDay; QCheckBox* m_cbEnableWebcam; QCheckBox* m_cbCapitalize; QCheckBox* m_cbFormat; diff --git a/src/main.cpp b/src/main.cpp index 3299ac2c..97439dc4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -159,7 +159,6 @@ int main(int argc, char* argv[]) { } else { Tellico::MainWindow* tellico = new Tellico::MainWindow(); tellico->show(); - tellico->slotShowTipOfDay(false); // slotInit gets called out of a QTimer signal // but it wasn't always completing in-time // so call it manually to ensure it has finished diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d89519ff..72f7f825 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -745,11 +745,6 @@ void MainWindow::initActions() { KStandardAction::preferences(this, SLOT(slotShowConfigDialog()), actionCollection()); - /************************************************* - * Help menu - *************************************************/ - KStandardAction::tipOfDay(this, SLOT(slotShowTipOfDay()), actionCollection()); - /************************************************* * Short cuts *************************************************/ @@ -1631,10 +1626,6 @@ void MainWindow::slotHideConfigDialog() { } } -void MainWindow::slotShowTipOfDay(bool force_/*=true*/) { - KTipDialog::showTip(this, QStringLiteral("tellico/tellico.tips"), force_); -} - void MainWindow::slotStatusMsg(const QString& text_) { m_statusBar->setStatus(text_); } diff --git a/src/mainwindow.h b/src/mainwindow.h index c3f114d0..318acd31 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -276,12 +276,6 @@ public Q_SLOTS: * Hides the collection properties dialog for the application. */ void slotHideCollectionFieldsDialog(); - /** - * Shows the "Tip of the Day" dialog. - * - * @param force Whether the configuration setting should be ignored - */ - void slotShowTipOfDay(bool force=true); /** * Shows the string macro editor dialog for the application. */ diff --git a/src/tellicoui.rc b/src/tellicoui.rc index 14b9f74e..febecf63 100644 --- a/src/tellicoui.rc +++ b/src/tellicoui.rc @@ -1,6 +1,6 @@ <?xml version = '1.0'?> <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui version="43" name="tellico"> +<kpartgui version="44" name="tellico"> <MenuBar> <Menu name="file"> <text>&File</text> @@ -120,9 +120,6 @@ <Action append="show_merge" name="lock_layout"/> <Action append="show_merge" name="reset_layout"/> </Menu> - <Menu name="help"> - <Action name="tipOfDay"/> - </Menu> </MenuBar> <ToolBar noMerge="1" name="mainToolBar"> <text>Main Toolbar</text> diff --git a/tellico.tips b/tellico.tips deleted file mode 100644 index 69d86ac2..00000000 --- a/tellico.tips +++ /dev/null @@ -1,107 +0,0 @@ -<tip category="Tellico"> -<html> -<p>...that if a book has more than one author, you should separate -their names by a semi-colon, so that Tellico will know how to split them -and use them separately.</p> -<p>Any other field which allows multiple values should be entered the -same way, with a semi-colon (;) separating each value.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can change which fields are shown in the column view by -right-clicking on the column header. -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can add, edit, or modify the fields in the collection using -the Field Editor. The arrow buttons below the field list can be used to change the -position of the field in the list, which affects the placement in the entry -editor.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that if you want to filter by a Checkbox field, a value of -"true" should be used. If you'd like to filter to -show only the science fiction books which you've not read, for -example, check the <em>Match all of the -following</em> button, set the first rule to have "Genre" -"contains" "Science Fiction" (no quotes) and the second rule to -have "Read" "does not contain" "true" (no quotes).</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that if a non-word character is used in the Quick Filter, the text is -interpreted as a regular expression.</p> -<p>To show only books which are by Weber or Bujold, for example, then -type "weber|bujold" (no quotes) in the filter box.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can edit more than one entry at a time, by holding down -the Shift or Ctrl key and selecting multiple entries.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can convert an existing book collection to a bibliography, -which can then be exported to bibtex or Bibtexml format.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can add, edit, and delete string macros for bibliographies.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that if more than one field is formatted as a name, then an additional -group named "People" is added to the collection, allowing authors and editors -to be sorted or printed together, for example.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can modify the appearance of the printed output by modifying -the <tt>tellico-printing.xsl</tt> file. The file generates HTML, and the CSS -within the stylesheet governs things like the font, the margins, etc.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can import using any generic XSL stylesheet which -outputs a valid Tellico XML file.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that double-clicking an entry item opens the Entry Editor.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can add HTML tags to any Paragraph field for formatting, such as -<b>bold</b> or <i>italic</i>.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that when the Column View is focused, you can press a letter on the -keyboard to scroll to the next entry that starts with that letter.</p> -</html> -</tip> -<tip category="Tellico"> -<html> -<p>...that you can use a field with a derived value to combine multiple separated fields -into a single field. Use a derived value template -similar to "Value: %{fielda}%{fieldb}" where %{...} gets replaced with the -appropriate field value. This is useful to collect multiple values in a -single field, e.g. for better grouping, and to combine fields of different -types by respecting proper sorting at the same time. Consider for example -a number field followed by a text subfield with entries 3b, 14a.</p> -</html> -</tip>
