Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
Jaye Evins
GitHub
+152
-152
@@ -1,31 +1,31 @@
|
||||
/* MergeView.cpp
|
||||
*
|
||||
* Copyright (C) 2016 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of gLabels-qt.
|
||||
*
|
||||
* gLabels-qt is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* gLabels-qt 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 gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// MergeView.cpp
|
||||
//
|
||||
// Copyright (C) 2016 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of gLabels-qt.
|
||||
//
|
||||
// gLabels-qt is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// gLabels-qt 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 gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
|
||||
#include "MergeView.h"
|
||||
#include "MergeView.hpp"
|
||||
|
||||
#include "MergeTableModel.h"
|
||||
#include "MergeTableModel.hpp"
|
||||
|
||||
#include "merge/Factory.h"
|
||||
#include "merge/Factory.hpp"
|
||||
|
||||
#include "model/FileUtil.h"
|
||||
#include "model/FileUtil.hpp"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QFileDialog>
|
||||
@@ -34,167 +34,167 @@
|
||||
|
||||
namespace glabels
|
||||
{
|
||||
const QChar NEWLINE_CHAR = QChar(0x23CE);
|
||||
const QChar NEWLINE_CHAR = QChar(0x23CE);
|
||||
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
MergeView::MergeView( QWidget *parent )
|
||||
: QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr), mOldFormatComboIndex(0)
|
||||
{
|
||||
setupUi( this );
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
MergeView::MergeView( QWidget *parent )
|
||||
: QWidget(parent), mModel(nullptr), mUndoRedoModel(nullptr), mOldFormatComboIndex(0)
|
||||
{
|
||||
setupUi( this );
|
||||
|
||||
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Merge") ) );
|
||||
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Merge") ) );
|
||||
|
||||
mMergeFormatNames = merge::Factory::nameList();
|
||||
formatCombo->addItems( mMergeFormatNames );
|
||||
}
|
||||
mMergeFormatNames = merge::Factory::nameList();
|
||||
formatCombo->addItems( mMergeFormatNames );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Set Model
|
||||
///
|
||||
void MergeView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
|
||||
{
|
||||
mModel = model;
|
||||
mUndoRedoModel = undoRedoModel;
|
||||
///
|
||||
/// Set Model
|
||||
///
|
||||
void MergeView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
|
||||
{
|
||||
mModel = model;
|
||||
mUndoRedoModel = undoRedoModel;
|
||||
|
||||
// Initialize CWD
|
||||
mCwd = mModel->dirPath();
|
||||
// Initialize CWD
|
||||
mCwd = mModel->dirPath();
|
||||
|
||||
onMergeChanged();
|
||||
connect( mModel, SIGNAL(mergeChanged()), this, SLOT(onMergeChanged()) );
|
||||
}
|
||||
onMergeChanged();
|
||||
connect( mModel, SIGNAL(mergeChanged()), this, SLOT(onMergeChanged()) );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Merge changed handler
|
||||
///
|
||||
void MergeView::onMergeChanged()
|
||||
{
|
||||
QString name = merge::Factory::idToName( mModel->merge()->id() );
|
||||
int index = mMergeFormatNames.indexOf( name );
|
||||
mOldFormatComboIndex = index;
|
||||
formatCombo->setCurrentIndex( index );
|
||||
///
|
||||
/// Merge changed handler
|
||||
///
|
||||
void MergeView::onMergeChanged()
|
||||
{
|
||||
QString name = merge::Factory::idToName( mModel->merge()->id() );
|
||||
int index = mMergeFormatNames.indexOf( name );
|
||||
mOldFormatComboIndex = index;
|
||||
formatCombo->setCurrentIndex( index );
|
||||
|
||||
QString fn;
|
||||
|
||||
switch ( merge::Factory::idToType( mModel->merge()->id() ) )
|
||||
{
|
||||
case merge::Factory::NONE:
|
||||
case merge::Factory::FIXED:
|
||||
locationLabel->setEnabled( false );
|
||||
locationLineEdit->setText( "" );
|
||||
locationBrowseButton->setVisible( false );
|
||||
break;
|
||||
QString fn;
|
||||
|
||||
case merge::Factory::FILE:
|
||||
locationLabel->setEnabled( true );
|
||||
fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
|
||||
locationLineEdit->setText( fn );
|
||||
locationBrowseButton->setVisible( true );
|
||||
break;
|
||||
switch ( merge::Factory::idToType( mModel->merge()->id() ) )
|
||||
{
|
||||
case merge::Factory::NONE:
|
||||
case merge::Factory::FIXED:
|
||||
locationLabel->setEnabled( false );
|
||||
locationLineEdit->setText( "" );
|
||||
locationBrowseButton->setVisible( false );
|
||||
break;
|
||||
|
||||
default:
|
||||
qWarning( "MergeView::onMergeChanged()::Should not be reached!" );
|
||||
break;
|
||||
}
|
||||
case merge::Factory::FILE:
|
||||
locationLabel->setEnabled( true );
|
||||
fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
|
||||
locationLineEdit->setText( fn );
|
||||
locationBrowseButton->setVisible( true );
|
||||
break;
|
||||
|
||||
recordsTableView->setModel( new MergeTableModel( mModel->merge() ) );
|
||||
recordsTableView->resizeColumnsToContents();
|
||||
default:
|
||||
qWarning( "MergeView::onMergeChanged()::Should not be reached!" );
|
||||
break;
|
||||
}
|
||||
|
||||
connect( mModel->merge(), SIGNAL(sourceChanged()),
|
||||
this, SLOT(onMergeSourceChanged()) );
|
||||
}
|
||||
recordsTableView->setModel( new MergeTableModel( mModel->merge() ) );
|
||||
recordsTableView->resizeColumnsToContents();
|
||||
|
||||
connect( mModel->merge(), SIGNAL(sourceChanged()),
|
||||
this, SLOT(onMergeSourceChanged()) );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Merge source changed handler
|
||||
///
|
||||
void MergeView::onMergeSourceChanged()
|
||||
{
|
||||
QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
|
||||
locationLineEdit->setText( fn );
|
||||
///
|
||||
/// Merge source changed handler
|
||||
///
|
||||
void MergeView::onMergeSourceChanged()
|
||||
{
|
||||
QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
|
||||
locationLineEdit->setText( fn );
|
||||
|
||||
recordsTableView->setModel( new MergeTableModel( mModel->merge() ) );
|
||||
recordsTableView->resizeColumnsToContents();
|
||||
}
|
||||
recordsTableView->setModel( new MergeTableModel( mModel->merge() ) );
|
||||
recordsTableView->resizeColumnsToContents();
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Format combo changed handler
|
||||
///
|
||||
void MergeView::onFormatComboActivated()
|
||||
{
|
||||
int index = formatCombo->currentIndex();
|
||||
if ( index != mOldFormatComboIndex )
|
||||
{
|
||||
mOldFormatComboIndex = index;
|
||||
///
|
||||
/// Format combo changed handler
|
||||
///
|
||||
void MergeView::onFormatComboActivated()
|
||||
{
|
||||
int index = formatCombo->currentIndex();
|
||||
if ( index != mOldFormatComboIndex )
|
||||
{
|
||||
mOldFormatComboIndex = index;
|
||||
|
||||
QString id = merge::Factory::indexToId(index);
|
||||
mModel->setMerge( merge::Factory::createMerge( id ) );
|
||||
}
|
||||
}
|
||||
QString id = merge::Factory::indexToId(index);
|
||||
mModel->setMerge( merge::Factory::createMerge( id ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Location button clicked handler
|
||||
///
|
||||
void MergeView::onLocationBrowseButtonClicked()
|
||||
{
|
||||
QString fileName =
|
||||
QFileDialog::getOpenFileName( this,
|
||||
tr("Select merge file"),
|
||||
mCwd,
|
||||
tr("All files (*)") );
|
||||
if ( !fileName.isEmpty() )
|
||||
{
|
||||
mModel->merge()->setSource( fileName );
|
||||
mCwd = QFileInfo( fileName ).absolutePath(); // Update CWD
|
||||
}
|
||||
}
|
||||
///
|
||||
/// Location button clicked handler
|
||||
///
|
||||
void MergeView::onLocationBrowseButtonClicked()
|
||||
{
|
||||
QString fileName =
|
||||
QFileDialog::getOpenFileName( this,
|
||||
tr("Select merge file"),
|
||||
mCwd,
|
||||
tr("All files (*)") );
|
||||
if ( !fileName.isEmpty() )
|
||||
{
|
||||
mModel->merge()->setSource( fileName );
|
||||
mCwd = QFileInfo( fileName ).absolutePath(); // Update CWD
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Select all button clicked handler
|
||||
///
|
||||
void MergeView::onSelectAllButtonClicked()
|
||||
{
|
||||
mModel->merge()->selectAll();
|
||||
}
|
||||
///
|
||||
/// Select all button clicked handler
|
||||
///
|
||||
void MergeView::onSelectAllButtonClicked()
|
||||
{
|
||||
mModel->merge()->selectAll();
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Unselect all button clicked handler
|
||||
///
|
||||
void MergeView::onUnselectAllButtonClicked()
|
||||
{
|
||||
mModel->merge()->unselectAll();
|
||||
}
|
||||
///
|
||||
/// Unselect all button clicked handler
|
||||
///
|
||||
void MergeView::onUnselectAllButtonClicked()
|
||||
{
|
||||
mModel->merge()->unselectAll();
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Reload button clicked handler
|
||||
///
|
||||
void MergeView::onReloadButtonClicked()
|
||||
{
|
||||
mModel->merge()->reloadSource();
|
||||
}
|
||||
///
|
||||
/// Reload button clicked handler
|
||||
///
|
||||
void MergeView::onReloadButtonClicked()
|
||||
{
|
||||
mModel->merge()->reloadSource();
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// modify text to be printable e.g. replace newlines
|
||||
///
|
||||
QString MergeView::printableTextForView( QString text )
|
||||
{
|
||||
// Replace windows style newlines
|
||||
text.replace("\r\n", NEWLINE_CHAR);
|
||||
///
|
||||
/// modify text to be printable e.g. replace newlines
|
||||
///
|
||||
QString MergeView::printableTextForView( QString text )
|
||||
{
|
||||
// Replace windows style newlines
|
||||
text.replace("\r\n", NEWLINE_CHAR);
|
||||
|
||||
// Replace unix style newlines
|
||||
text.replace("\n", NEWLINE_CHAR);
|
||||
// Replace unix style newlines
|
||||
text.replace("\n", NEWLINE_CHAR);
|
||||
|
||||
return text;
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
|
||||
} // namespace glabels
|
||||
|
||||
Reference in New Issue
Block a user