Browse Source

Now using gtksourceviewmm.

merge-requests/365/head
eidheim 11 years ago
parent
commit
689304712a
  1. 12
      juci/CMakeLists.txt
  2. 3
      juci/source.cc
  3. 3
      juci/source.h

12
juci/CMakeLists.txt

@ -88,6 +88,14 @@ else()
message("Gtkmm link dirs ${GTKMM_LIBRARIES}") message("Gtkmm link dirs ${GTKMM_LIBRARIES}")
message(FATAL_ERROR "The gtkmm libraries are required. Quitting.") message(FATAL_ERROR "The gtkmm libraries are required. Quitting.")
endif() endif()
pkg_check_modules(GTKSVMM gtksourceviewmm-3.0)
if(${GTKSVMM_FOUND})
message("Gtksourceviewmm libraries found. Continuing")
else()
message(FATAL_ERROR "The gtksourceviewmm libraries are required. Quitting.")
endif()
# name of the executable on Windows will be example.exe # name of the executable on Windows will be example.exe
add_executable(${project_name} add_executable(${project_name}
#list of every needed file to create the executable #list of every needed file to create the executable
@ -129,11 +137,13 @@ include_directories(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${GTKMM_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS}
${GTKSVMM_INCLUDE_DIRS}
${LCL_INCLUDE_DIRS} ${LCL_INCLUDE_DIRS}
${LIBCLANG_INCLUDE_DIRS} ${LIBCLANG_INCLUDE_DIRS}
) )
link_directories( link_directories(
${GTKMM_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS}
${GTKSVMM_LIBRARY_DIRS}
${Boost_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${LCL_LIBRARY_DIRS} ${LCL_LIBRARY_DIRS}
@ -144,6 +154,6 @@ set_target_properties(${module} PROPERTIES PREFIX ""
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib/") LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib/")
target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
#executable: #executable:
target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${GTKSVMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})

3
juci/source.cc

@ -29,6 +29,9 @@ Range(const Source::Range &org) :
////////////// //////////////
Source::View::View() { Source::View::View() {
override_font(Pango::FontDescription("Monospace")); override_font(Pango::FontDescription("Monospace"));
set_show_line_numbers(true);
set_highlight_current_line(true);
set_smart_home_end(Gsv::SMART_HOME_END_ALWAYS);
} }
string Source::View::GetLine(const Gtk::TextIter &begin) { string Source::View::GetLine(const Gtk::TextIter &begin) {

3
juci/source.h

@ -8,6 +8,7 @@
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include "gtksourceviewmm.h"
namespace Notebook { namespace Notebook {
class Controller; class Controller;
@ -60,7 +61,7 @@ namespace Source {
int kind_; int kind_;
}; };
class View : public Gtk::TextView { class View : public Gsv::View {
public: public:
View(); View();
virtual ~View() { } virtual ~View() { }

Loading…
Cancel
Save