From a45609e945a89eaefa21bc231462dcb1cb49315b Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Mon, 6 Aug 2012 12:00:25 +0000 Subject: [PATCH] Added copyright/legal info. Cleared some deprecation warnings. --- ede-panel/applets/taskbar/TaskButton.cpp | 26 ++++++++++++++++++++++-- ede-panel/applets/taskbar/TaskButton.h | 20 ++++++++++++++++++ ede-panel/applets/taskbar/Taskbar.cpp | 21 ++++++++++++++++++- ede-panel/applets/taskbar/Taskbar.h | 20 ++++++++++++++++++ 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/ede-panel/applets/taskbar/TaskButton.cpp b/ede-panel/applets/taskbar/TaskButton.cpp index 32b011a..40a3957 100644 --- a/ede-panel/applets/taskbar/TaskButton.cpp +++ b/ede-panel/applets/taskbar/TaskButton.cpp @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Sanel Zukan + * + * 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 #include @@ -24,12 +44,14 @@ EDELIB_NS_USING(IconLoader) EDELIB_NS_USING(ICON_SIZE_TINY) EDELIB_NS_USING(netwm_window_close) EDELIB_NS_USING(netwm_window_set_active) -EDELIB_NS_USING(netwm_window_maximize) EDELIB_NS_USING(netwm_window_get_title) +EDELIB_NS_USING(netwm_window_set_state) EDELIB_NS_USING(wm_window_ede_restore) EDELIB_NS_USING(wm_window_get_state) EDELIB_NS_USING(wm_window_set_state) EDELIB_NS_USING(WM_WINDOW_STATE_ICONIC) +EDELIB_NS_USING(NETWM_STATE_ACTION_TOGGLE) +EDELIB_NS_USING(NETWM_STATE_MAXIMIZED) static Fl_Pixmap image_window(window_xpm); @@ -79,7 +101,7 @@ static void maximize_cb(Fl_Widget*, void *b) { TaskButton *bb = (TaskButton*)b; netwm_window_set_active(bb->get_window_xid()); - netwm_window_maximize(bb->get_window_xid()); + netwm_window_set_state(bb->get_window_xid(), NETWM_STATE_MAXIMIZED, NETWM_STATE_ACTION_TOGGLE); redraw_whole_panel(bb); } diff --git a/ede-panel/applets/taskbar/TaskButton.h b/ede-panel/applets/taskbar/TaskButton.h index 337761e..2ae7a0e 100644 --- a/ede-panel/applets/taskbar/TaskButton.h +++ b/ede-panel/applets/taskbar/TaskButton.h @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Sanel Zukan + * + * 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 __TASKBUTTON_H__ #define __TASKBUTTON_H__ diff --git a/ede-panel/applets/taskbar/Taskbar.cpp b/ede-panel/applets/taskbar/Taskbar.cpp index 1262a12..1ec30fe 100644 --- a/ede-panel/applets/taskbar/Taskbar.cpp +++ b/ede-panel/applets/taskbar/Taskbar.cpp @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Sanel Zukan + * + * 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 #include #include @@ -261,7 +281,6 @@ void Taskbar::panel_redraw(void) { panel->redraw(); } - EDE_PANEL_APPLET_EXPORT ( Taskbar, EDE_PANEL_APPLET_OPTION_ALIGN_LEFT | EDE_PANEL_APPLET_OPTION_RESIZABLE_H, diff --git a/ede-panel/applets/taskbar/Taskbar.h b/ede-panel/applets/taskbar/Taskbar.h index f00083f..830748b 100644 --- a/ede-panel/applets/taskbar/Taskbar.h +++ b/ede-panel/applets/taskbar/Taskbar.h @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Sanel Zukan + * + * 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 __TASKBAR_H__ #define __TASKBAR_H__