From 4c0dc51110603cbe0e98228c703e26402094a3cc Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 12 Jul 2014 23:02:52 +0200 Subject: Finish of the OtherLogs page, and (re)format page related files --- gui/pages/OtherLogsPage.h | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'gui/pages/OtherLogsPage.h') diff --git a/gui/pages/OtherLogsPage.h b/gui/pages/OtherLogsPage.h index e89b3bce..5cabf03f 100644 --- a/gui/pages/OtherLogsPage.h +++ b/gui/pages/OtherLogsPage.h @@ -1,10 +1,26 @@ +/* Copyright 2014 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #pragma once #include #include "BasePage.h" -namespace Ui { +namespace Ui +{ class OtherLogsPage; } @@ -20,15 +36,27 @@ public: explicit OtherLogsPage(BaseInstance *instance, QWidget *parent = 0); ~OtherLogsPage(); - QString id() const override { return "logs"; } - QString displayName() const override { return tr("Other logs"); } - QIcon icon() const override { return QIcon(); } // TODO - QString helpPage() const override { return "Minecraft-Logs"; } + QString id() const override + { + return "logs"; + } + QString displayName() const override + { + return tr("Other logs"); + } + QIcon icon() const override + { + return QIcon::fromTheme("log"); + } + QString helpPage() const override + { + return "Minecraft-Logs"; + } void opened() override; void closed() override; -private -slots: +private slots: + void populateSelectLogBox(); void on_selectLogBox_currentIndexChanged(const int index); void on_btnReload_clicked(); void on_btnPaste_clicked(); -- cgit v1.2.3