Add Qtr_ macros that uses gettext in a tr() compatible manner

This should wrap gettext nicely and replace the "_()" macros we use in C
code.

Also added comments to the top of all the new files.

Suggested-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-04-13 20:44:02 -07:00
parent 14e133321f
commit f5c958ad73
16 changed files with 113 additions and 22 deletions

View file

@ -1,3 +1,9 @@
/*
* addcylinderdialog.cpp
*
* classes for the add cylinder dialog of Subsurface
*
*/
#include "addcylinderdialog.h"
#include "ui_addcylinderdialog.h"
#include <QComboBox>

View file

@ -1,3 +1,9 @@
/*
* addcylinderdialog.h
*
* header file for the add cylinder dialog of Subsurface
*
*/
#ifndef ADDCYLINDERDIALOG_H
#define ADDCYLINDERDIALOG_H

View file

@ -1,3 +1,9 @@
/*
* divelistview.cpp
*
* classes for the divelist of Subsurface
*
*/
#include "divelistview.h"
DiveListView::DiveListView(QWidget *parent) : QTreeView(parent)

View file

@ -1,3 +1,9 @@
/*
* divelistview.h
*
* header file for the dive list of Subsurface
*
*/
#ifndef DIVELISTVIEW_H
#define DIVELISTVIEW_H

View file

@ -1,3 +1,10 @@
/*
* divetripmodel.cpp
*
* classes for the dive trip list in Subsurface
*/
#include "common.h"
#include "divetripmodel.h"
@ -63,15 +70,15 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
if (section == DIVE_NUMBER) {
return tr("Dive number");
return Qtr_("Dive number");
} else if (section == DIVE_DATE_TIME) {
return tr("Date");
return Qtr_("Date");
} else if (section == DIVE_DURATION) {
return tr("Duration");
return Qtr_("Duration");
} else if (section == DIVE_DEPTH) {
return tr("Depth");
return Qtr_("Depth");
} else if (section == DIVE_LOCATION) {
return tr("Location");
return Qtr_("Location");
}
}
return QVariant();

View file

@ -1,3 +1,9 @@
/*
* divetripmodel.h
*
* header file for the divetrip model of Subsurface
*
*/
#ifndef DIVETRIPMODEL_H
#define DIVETRIPMODEL_H

View file

@ -1,3 +1,10 @@
/*
* maintab.cpp
*
* classes for the "notebook" area of the main window of Subsurface
*
*/
#include "common.h"
#include "maintab.h"
#include "ui_maintab.h"
#include "addcylinderdialog.h"

View file

@ -1,3 +1,9 @@
/*
* maintab.h
*
* header file for the main tab of Subsurface
*
*/
#ifndef MAINTAB_H
#define MAINTAB_H

View file

@ -1,3 +1,10 @@
/*
* mainwindow.cpp
*
* classes for the main UI window in Subsurface
*/
#include "common.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
@ -53,7 +60,7 @@ void MainWindow::on_actionNew_triggered()
void MainWindow::on_actionOpen_triggered()
{
QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), filter());
QString filename = QFileDialog::getOpenFileName(this, Qtr_("Open File"), QDir::homePath(), filter());
if (filename.isEmpty()){
return;
}
@ -283,10 +290,10 @@ QString MainWindow::filter()
bool MainWindow::askSaveChanges()
{
QString message = ! existing_filename ? tr("You have unsaved changes\nWould you like to save those before closing the datafile?")
: tr("You have unsaved changes to file: %1 \nWould you like to save those before closing the datafile?").arg(existing_filename);
QString message = ! existing_filename ? Qtr_("You have unsaved changes\nWould you like to save those before closing the datafile?")
: Qtr_("You have unsaved changes to file: %1 \nWould you like to save those before closing the datafile?").arg(existing_filename);
if (QMessageBox::question(this, tr("Save Changes?"), message) == QMessageBox::Ok){
if (QMessageBox::question(this, Qtr_("Save Changes?"), message) == QMessageBox::Ok){
// WARNING: Port.
// file_save(NULL,NULL);
return true;

View file

@ -1,3 +1,9 @@
/*
* mainwindow.h
*
* header file for the main window of Subsurface
*
*/
#ifndef MAINWINDOW_H
#define MAINWINDOW_H

View file

@ -1,3 +1,10 @@
/*
* models.cpp
*
* classes for the equipment models of Subsurface
*
*/
#include "common.h"
#include "models.h"
#include "../dive.h"
@ -15,25 +22,25 @@ QVariant CylindersModel::headerData(int section, Qt::Orientation orientation, in
if (role == Qt::DisplayRole) {
switch(section) {
case TYPE:
ret = tr("Type");
ret = Qtr_("Type");
break;
case SIZE:
ret = tr("Size");
ret = Qtr_("Size");
break;
case MAXPRESS:
ret = tr("MaxPress");
ret = Qtr_("MaxPress");
break;
case START:
ret = tr("Start");
ret = Qtr_("Start");
break;
case END:
ret = tr("End");
ret = Qtr_("End");
break;
case O2:
ret = tr("O2%");
ret = Qtr_("O2%");
break;
case HE:
ret = tr("He%");
ret = Qtr_("He%");
break;
}
}
@ -157,10 +164,10 @@ QVariant WeightModel::headerData(int section, Qt::Orientation orientation, int r
switch(section){
case TYPE:
ret = tr("Type");
ret = Qtr_("Type");
break;
case WEIGHT:
ret = tr("Weight");
ret = Qtr_("Weight");
break;
}
return ret;

View file

@ -1,3 +1,9 @@
/*
* models.h
*
* header file for the equipment models of Subsurface
*
*/
#ifndef MODELS_H
#define MODELS_H

View file

@ -0,0 +1,6 @@
/*
* plotareascene.cpp
*
* classes for profile plot area scene of Subsurface
*
*/

View file

@ -0,0 +1,6 @@
/*
* plotareascene.h
*
* header file for the profile plot area scene of Subsurface
*
*/