diff --git a/ChangeLog b/ChangeLog index 292f65c3..eea759c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17997,3 +17997,5 @@ * Restored the status display bubble on rdmonitor(1). 2018-11-09 Fred Gleason * Tweaked layout and appearance of the status bubble in rdmonitor(1). +2018-11-09 Fred Gleason + * Removed superceded 'StatusTip' class from rdmonitor(1). diff --git a/rdmonitor/rdmonitor_cs.ts b/rdmonitor/rdmonitor_cs.ts index 549e3a25..672c0ce6 100644 --- a/rdmonitor/rdmonitor_cs.ts +++ b/rdmonitor/rdmonitor_cs.ts @@ -40,19 +40,19 @@ QObject Status: OK - Stav: OK + Stav: OK Audio Store: FAILED - Uložení zvuku: NEPODAŘILO SE + Uložení zvuku: NEPODAŘILO SE Database: CONNECTION FAILED - Databáze: SPOJENÍ SE NEZDAŘILO + Databáze: SPOJENÍ SE NEZDAŘILO Database: SCHEMA SKEWED - Databáze: SCHÉMA ZKRESLENO + Databáze: SCHÉMA ZKRESLENO diff --git a/rdmonitor/rdmonitor_de.ts b/rdmonitor/rdmonitor_de.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_de.ts +++ b/rdmonitor/rdmonitor_de.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/rdmonitor_es.ts b/rdmonitor/rdmonitor_es.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_es.ts +++ b/rdmonitor/rdmonitor_es.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/rdmonitor_fr.ts b/rdmonitor/rdmonitor_fr.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_fr.ts +++ b/rdmonitor/rdmonitor_fr.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/rdmonitor_nb.ts b/rdmonitor/rdmonitor_nb.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_nb.ts +++ b/rdmonitor/rdmonitor_nb.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/rdmonitor_nn.ts b/rdmonitor/rdmonitor_nn.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_nn.ts +++ b/rdmonitor/rdmonitor_nn.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/rdmonitor_pt_BR.ts b/rdmonitor/rdmonitor_pt_BR.ts index 9d31895b..afda54cb 100644 --- a/rdmonitor/rdmonitor_pt_BR.ts +++ b/rdmonitor/rdmonitor_pt_BR.ts @@ -36,23 +36,4 @@ - - QObject - - Status: OK - - - - Audio Store: FAILED - - - - Database: CONNECTION FAILED - - - - Database: SCHEMA SKEWED - - - diff --git a/rdmonitor/status_tip.cpp b/rdmonitor/status_tip.cpp deleted file mode 100644 index d71838aa..00000000 --- a/rdmonitor/status_tip.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// status_tip.cpp -// -// Custom ToolTip for RDMonitor's Status Bubble -// -// (C) Copyright 2012-2018 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include - -#include - -#include - -StatusTip::StatusTip(QWidget *widget,QToolTipGroup *group) - : QToolTip(widget,group) -{ - setStatus(QRect(),true,0,true); -} - - -void StatusTip::setStatus(const QRect &rect,bool db_status,int schema, - bool snd_status) -{ - tip_rect=rect; - if(db_status&&(schema==RD_VERSION_DATABASE)&&snd_status) { - tip_text=QObject::tr("Status: OK"); - } - else { - tip_text=""; - if(!db_status) { - tip_text=QObject::tr("Database: CONNECTION FAILED"); - } - else { - if(schema!=RD_VERSION_DATABASE) { - tip_text=QObject::tr("Database: SCHEMA SKEWED"); - } - } - if(!snd_status) { - if(!tip_text.isEmpty()) { - tip_text+="\n"; - } - tip_text+=QObject::tr("Audio Store: FAILED"); - } - } -} - - -void StatusTip::maybeTip(const QPoint &pt) -{ - tip(tip_rect,tip_text); -} diff --git a/rdmonitor/status_tip.h b/rdmonitor/status_tip.h deleted file mode 100644 index e118b3b4..00000000 --- a/rdmonitor/status_tip.h +++ /dev/null @@ -1,40 +0,0 @@ -// status_tip.h -// -// Custom ToolTip for RDMonitor's Status Bubble -// -// (C) Copyright 2012-2018 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef STATUS_TIP_H -#define STATUS_TIP_H - -#include - -class StatusTip : public QToolTip -{ - public: - StatusTip(QWidget *widget,QToolTipGroup *group=0); - void setStatus(const QRect &rect,bool db_status,int schema,bool snd_status); - - protected: - void maybeTip(const QPoint &pt); - - private: - QString tip_text; - QRect tip_rect; -}; - -#endif // STATUS_TIP_H