Skip to content

Commit

Permalink
Revert "Revert "Added some very basic documentation""
Browse files Browse the repository at this point in the history
This reverts commit 7a8dcee.
  • Loading branch information
laudrup committed Jun 23, 2011
1 parent 7a8dcee commit 4d93104
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 438 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ add_subdirectory(pics)


# The icons # The icons
add_subdirectory(icons) add_subdirectory(icons)

# The documentation
add_subdirectory(doc)
2 changes: 1 addition & 1 deletion creox/creox.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void Creox::initEffectsGui()
dockDistortion->setWidget(trayDistortion); dockDistortion->setWidget(trayDistortion);
dockDistortion->setWindowTitle(distortion->effectName()); dockDistortion->setWindowTitle(distortion->effectName());


dockDistortion->setWindowIcon(KIcon("media-playback-start"));//, iconLoader)); //dockDistortion->setWindowIcon(KIcon("media-playback-start"));//, iconLoader));


// dockDistortion->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | // dockDistortion->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable |
// QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetVerticalTitleBar); // QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetVerticalTitleBar);
Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Original file line Diff line number Diff line change
@@ -1 +1 @@
add_subdirectory(en) kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR creox)
3 changes: 0 additions & 3 deletions doc/en/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 4d93104

Please sign in to comment.