walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'gui-logview' of github.com:kimmov/cppcheck

This commit is contained in:
Kimmo Varis 2010-07-17 10:42:22 +03:00
parent 6362e50e73 de767a7cf1
commit e3c3194cf2
11 changed files with 266 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/common.h
View File

@ -58,6 +58,8 @@ ShowTypes;
#define SETTINGS_LANGUAGE "Application language"
#define SETTINGS_TOOLBARS_MAIN_SHOW "Toolbars/ShowStandard"
#define SETTINGS_TOOLBARS_VIEW_SHOW "Toolbars/ShowView"
#define SETTINGS_LOG_VIEW_WIDTH "Log/View width"
#define SETTINGS_LOG_VIEW_HEIGHT "Log/View height"
/// @}
#endif

10
gui/gui.pro
View File

@ -26,7 +26,8 @@ FORMS = main.ui \
settings.ui \
file.ui \
projectfile.ui \
about.ui
about.ui \
logview.ui
TRANSLATIONS = cppcheck_fi.ts \
cppcheck_nl.ts \
@ -60,7 +61,9 @@ HEADERS += mainwindow.h \
txtreport.h \
xmlreport.h \
translationhandler.h \
csvreport.h
csvreport.h \
logview.h
SOURCES += main.cpp \
mainwindow.cpp\
checkthread.cpp \
@ -81,7 +84,8 @@ SOURCES += main.cpp \
txtreport.cpp \
xmlreport.cpp \
translationhandler.cpp \
csvreport.cpp
csvreport.cpp \
logview.cpp
win32 {
RC_FILE = cppcheck-gui.rc

56
gui/logview.cpp Normal file
View File

@ -0,0 +1,56 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2010 Daniel Marjamäki and Cppcheck team.
*
* This program 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.
*
* 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, see <http://www.gnu.org/licenses/>.
*/
#include <QSettings>
#include "common.h"
#include "logview.h"
LogView::LogView(QSettings *programSettings, QWidget *parent)
: mSettings(programSettings)
{
Q_UNUSED(parent);
mUI.setupUi(this);
setWindowFlags(Qt::Tool);
connect(mUI.mCloseButton, SIGNAL(clicked()), this, SLOT(CloseButtonClicked()));
connect(mUI.mClearButton, SIGNAL(clicked()), this, SLOT(ClearButtonClicked()));
resize(mSettings->value(SETTINGS_LOG_VIEW_WIDTH, 400).toInt(),
mSettings->value(SETTINGS_LOG_VIEW_HEIGHT, 300).toInt());
}
LogView::~LogView()
{
mSettings->setValue(SETTINGS_LOG_VIEW_WIDTH, size().width());
mSettings->setValue(SETTINGS_LOG_VIEW_HEIGHT, size().height());
}
void LogView::AppendLine(const QString &line)
{
mUI.mLogEdit->appendPlainText(line);
}
void LogView::CloseButtonClicked()
{
close();
}
void LogView::ClearButtonClicked()
{
mUI.mLogEdit->clear();
}

75
gui/logview.h Normal file
View File

@ -0,0 +1,75 @@
/*
* Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2010 Daniel Marjamäki and Cppcheck team.
*
* This program 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.
*
* 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef LOGVIEW_H
#define LOGVIEW_H
#include <QWidget>
#include "ui_logview.h"
class QSettings;
/// @addtogroup GUI
/// @{
/**
* @brief A tool window that shows checking log.
*
*/
class LogView : public QWidget
{
Q_OBJECT
public:
LogView(QSettings *programSettings, QWidget *parent = 0);
~LogView();
/**
* @brief Append new log file to view.
* @param line String to add.
*
*/
void AppendLine(const QString &line);
protected slots:
/**
* @brief Called when close button is clicked.
*
*/
void CloseButtonClicked();
/**
* @brief Called when clear button is clicked.
*
*/
void ClearButtonClicked();
private:
Ui::LogView mUI;
/**
* @brief Settings
*
*/
QSettings *mSettings;
};
/// @}
#endif // LOGVIEW_H

65
gui/logview.ui Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LogView</class>
<widget class="QWidget" name="LogView">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="windowTitle">
<string>Checking Log</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPlainTextEdit" name="mLogEdit">
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mClearButton">
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mCloseButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

9
gui/main.ui
View File

@ -100,6 +100,7 @@
<addaction name="mActionCollapseAll"/>
<addaction name="mActionExpandAll"/>
<addaction name="separator"/>
<addaction name="mActionViewLog"/>
</widget>
<widget class="QMenu" name="mMenuLanguage">
<property name="title">
@ -365,6 +366,14 @@
<string>&amp;New Project File...</string>
</property>
</action>
<action name="mActionViewLog">
<property name="text">
<string>&amp;Log View</string>
</property>
<property name="toolTip">
<string>Log View</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

25
gui/mainwindow.cpp
View File

@ -33,6 +33,7 @@
#include "projectfile.h"
#include "project.h"
#include "report.h"
#include "logview.h"
#include "../lib/filelister.h"
// HTMLHelp is only available in Windows
@ -45,12 +46,14 @@ MainWindow::MainWindow() :
mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)),
mApplications(new ApplicationList(this)),
mTranslation(new TranslationHandler(this)),
mLanguages(new QActionGroup(this))
mLanguages(new QActionGroup(this)),
mLogView(NULL)
{
mUI.setupUi(this);
mUI.mResults->Initialize(mSettings, mApplications);
mThread = new ThreadHandler(this);
mLogView = new LogView(mSettings);
connect(mUI.mActionQuit, SIGNAL(triggered()), this, SLOT(close()));
connect(mUI.mActionCheckFiles, SIGNAL(triggered()), this, SLOT(CheckFiles()));
@ -65,6 +68,7 @@ MainWindow::MainWindow() :
connect(mUI.mActionUncheckAll, SIGNAL(triggered()), this, SLOT(UncheckAll()));
connect(mUI.mActionCollapseAll, SIGNAL(triggered()), mUI.mResults, SLOT(CollapseAllResults()));
connect(mUI.mActionExpandAll, SIGNAL(triggered()), mUI.mResults, SLOT(ExpandAllResults()));
connect(mUI.mActionViewLog, SIGNAL(triggered()), this, SLOT(ShowLogView()));
connect(mUI.mActionRecheck, SIGNAL(triggered()), this, SLOT(ReCheck()));
@ -114,6 +118,7 @@ MainWindow::MainWindow() :
MainWindow::~MainWindow()
{
delete mLogView;
}
void MainWindow::CreateLanguageMenuItems()
@ -731,3 +736,21 @@ void MainWindow::NewProjectFile()
prj.Edit();
}
}
void MainWindow::ShowLogView()
{
if (mLogView == NULL)
mLogView = new LogView(mSettings);
mLogView->show();
if (!mLogView->isActiveWindow())
mLogView->activateWindow();
}
void MainWindow::Log(const QString &logline)
{
if (mLogView)
{
mLogView->AppendLine(logline);
}
}

18
gui/mainwindow.h
View File

@ -32,6 +32,7 @@
#include "ui_main.h"
class ThreadHandler;
class LogView;
/// @addtogroup GUI
/// @{
@ -143,6 +144,12 @@ public slots:
*/
void OpenProjectFile();
/**
* @brief Slot for showing the log view.
*
*/
void ShowLogView();
protected slots:
/**
@ -190,6 +197,12 @@ protected slots:
*/
void OpenHelpContents();
/**
* @brief Add new line to log.
*
*/
void Log(const QString &logline);
protected:
/**
@ -325,6 +338,11 @@ protected:
*/
QString mCurrentDirectory;
/**
* @brief Log view..
*/
LogView *mLogView;
};
/// @}
#endif // MAINWINDOW_H

2
gui/threadhandler.cpp
View File

@ -144,6 +144,8 @@ void ThreadHandler::Initialize(ResultsView *view)
connect(&mResults, SIGNAL(Error(const ErrorItem &)),
view, SLOT(Error(const ErrorItem &)));
connect(&mResults, SIGNAL(Log(const QString &)),
parent(), SLOT(Log(const QString &)));
}
void ThreadHandler::LoadSettings(QSettings &settings)

2
gui/threadresult.cpp
View File

@ -33,7 +33,7 @@ ThreadResult::~ThreadResult()
void ThreadResult::reportOut(const std::string &outmsg)
{
Q_UNUSED(outmsg);
emit Log(QString::fromStdString(outmsg));
}
void ThreadResult::FileChecked(const QString &file)

7
gui/threadresult.h
View File

@ -93,6 +93,13 @@ signals:
*/
void Error(const ErrorItem &item);
/**
* @brief Signal of a new log message
*
* @param logline Log line
*/
void Log(const QString &logline);
protected:
/**