Commit 6fc2b7c2 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

First steps for the keyboard shortcut preferences

parent 34060cc7
<RCC>
<qresource prefix="/Lang">
<file alias="es">ts/vlmc_es.qm</file>
<file alias="fr">ts/vlmc_fr.qm</file>
<file alias="sv">ts/vlmc_sv.qm</file>
<qresource prefix="/Lang" >
<file alias="es" >ts/vlmc_es.qm</file>
<file alias="fr" >ts/vlmc_fr.qm</file>
<file alias="sv" >ts/vlmc_sv.qm</file>
</qresource>
<qresource prefix="/images">
<qresource prefix="/images" >
<file>images/vlmc.png</file>
<file alias="play">images/play.png</file>
<file alias="pause">images/pause.png</file>
<file alias="back">images/back.png</file>
<file alias="forward">images/forward.png</file>
<file alias="up">images/up.png</file>
<file alias="play" >images/play.png</file>
<file alias="pause" >images/pause.png</file>
<file alias="back" >images/back.png</file>
<file alias="forward" >images/forward.png</file>
<file alias="up" >images/up.png</file>
<file>images/next_frame.png</file>
<file>images/previous_frame.png</file>
<file>images/stop.png</file>
......@@ -19,26 +19,27 @@
<file>images/add.png</file>
<file>images/marker_left.png</file>
<file>images/marker_right.png</file>
<file alias="editcut">images/editcut.png</file>
<file alias="mouse">images/mouse.png</file>
<file alias="zoomin">images/zoom_in.png</file>
<file alias="zoomout">images/zoom_out.png</file>
<file alias="trackon">images/trackon.png</file>
<file alias="trackoff">images/trackoff.png</file>
<file alias="hpon">images/hpon.png</file>
<file alias="hpoff">images/hpoff.png</file>
<file alias="editcut" >images/editcut.png</file>
<file alias="mouse" >images/mouse.png</file>
<file alias="zoomin" >images/zoom_in.png</file>
<file alias="zoomout" >images/zoom_out.png</file>
<file alias="trackon" >images/trackon.png</file>
<file alias="trackoff" >images/trackoff.png</file>
<file alias="hpon" >images/hpon.png</file>
<file alias="hpoff" >images/hpoff.png</file>
<file>images/audio.png</file>
<file>images/video.png</file>
<file alias="wizard_watermark">images/wizard_watermark.png</file>
<file alias="wizard_watermark" >images/wizard_watermark.png</file>
<file alias="keyboard" >images/keyboard.png</file>
</qresource>
<qresource prefix="/text">
<qresource prefix="/text" >
<file>AUTHORS</file>
<file>COPYING</file>
<file>TRANSLATORS</file>
</qresource>
<qresource prefix="/images/scalable">
<file alias="audio-scalable">images/scalable/audio.svg</file>
<file alias="image-scalable">images/scalable/image.svg</file>
<file alias="video-scalable">images/scalable/video.svg</file>
<qresource prefix="/images/scalable" >
<file alias="audio-scalable" >images/scalable/audio.svg</file>
<file alias="image-scalable" >images/scalable/image.svg</file>
<file alias="video-scalable" >images/scalable/video.svg</file>
</qresource>
</RCC>
......@@ -54,6 +54,7 @@
#include "MediaLibraryWidget.h"
#include "LanguagePreferences.h"
#include "ProjectManager.h"
#include "KeyboardShortcut.h"
MainWindow::MainWindow( QWidget *parent ) :
QMainWindow( parent ), m_renderer( NULL )
......@@ -286,6 +287,10 @@ void MainWindow::createProjectPreferences()
new AudioProjectPreferences,
QIcon( ":/images/images/audio.png" ),
"Audio settings" );
m_projectPreferences->addWidget( "Keyboard",
new KeyboardShortcut,
QIcon( ":/images/images/keyboard.png" ),
tr( "Keyboard Settings" ) );
m_projectPreferences->build();
}
......
/*****************************************************************************
* KeyboardShortcutInput.cpp: Input widget for keybard shortcut
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
* Authors: Hugo Beauzee-Luyssen <hugo@vlmc.org>
*
* 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 2
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QKeyEvent>
#include <QKeySequence>
#include <QtDebug>
......
/*****************************************************************************
* KeyboardShortcutInput.h: Input widget for keybard shortcut
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
* Authors: Hugo Beauzee-Luyssen <hugo@vlmc.org>
*
* 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 2
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef KEYBOARDSHORTCUTINPUT_H
#define KEYBOARDSHORTCUTINPUT_H
......
......@@ -12,6 +12,7 @@ HEADERS += AudioProjectPreferences.h \
Settings.h \
KeyboardShortcutInput.h \
VLMCPreferences.h \
KeyboardShortcut.h \
VideoProjectPreferences.h
SOURCES += AudioProjectPreferences.cpp \
......@@ -21,4 +22,5 @@ SOURCES += AudioProjectPreferences.cpp \
Settings.cpp \
KeyboardShortcutInput.cpp \
VLMCPreferences.cpp \
KeyboardShortcut.cpp \
VideoProjectPreferences.cpp
......@@ -36,7 +36,6 @@ include(src/Project/projectManager.pri)
include(src/Renderer/Renderer.pri)
include(src/Tools/Tools.pri)
include(src/Workflow/Workflow.pri)
INCLUDEPATH += src/LibVLCpp \
src/GUI \
src/GUI/widgets \
......@@ -57,7 +56,6 @@ INCLUDEPATH += src/LibVLCpp \
src/EffectsEngine \
src/Actions \
src
DEPENDPATH += src/LibVLCpp \
src/GUI \
src/GUI/import \
......@@ -78,7 +76,6 @@ DEPENDPATH += src/LibVLCpp \
src/EffectsEngine \
src/Actions \
src
TRANSLATIONS = ts/vlmc_es.ts \
ts/vlmc_fr.ts \
ts/vlmc_sv.ts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment